Merge branch 'trunk-gd' of https://github.com/griddynamics/oozie into trunk-gd
Merge branch 'trunk-gd' of https://github.com/griddynamics/oozie into trunk-gd
Merge branch 'trunk-gd' of https://github.com/griddynamics/oozie into trunk-gd
Resolve merge conflict