OOZIE-1337 HadoopAccessorService has two static methods so you can't override them with another implementation (rkanter)

git-svn-id: https://svn.apache.org/repos/asf/oozie/trunk@1475649 13f79535-47bb-0310-9956-ffa450edef68
OOZIE-1341 Have Action Main classes in Oozie webapp (virag)

git-svn-id: https://svn.apache.org/repos/asf/oozie/trunk@1475652 13f79535-47bb-0310-9956-ffa450edef68
Merge remote branch 'origin/trunk' into trunk