Revert "Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/oozie"

This reverts commit e7f0020731385bbd58683941002003fe0cabfa96, reversing
changes made to cb9cbe8b2a3a5acccc9deaa0ef5826a671d9e5a2.
missed commit as part of OOZIE-1704