OOZIE-557 & OOZIE-602

[Alejandro Abdelnur]

Could somebody review the patches for these to JIRAs?

  https://reviews.apache.org/r/1894/
  https://reviews.apache.org/r/2801/

Thanks.

Alejandro