[oozie] Refactored redundant code
[oozie] Support for node move
Merge remote-tracking branch 'remotes/origin/oozie2' into oozie2