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

Conflicts:
	pom.xml
Merge remote branch 'origin/trunk' into trunk-gd
Merge remote branch 'origin/trunk-gd' into fb-YAHOO-308-trunk-gd