Merge pull request #13 from satish-mittal/branch-4.0

OOZIE-1675: Merge from Apache oozie 4.1.0 trunk