OOZIE-1440 Build fails in certain environments due to xerces OpenJPA issue (mackrorysd via rkanter)

git-svn-id: https://svn.apache.org/repos/asf/oozie/trunk@1498654 13f79535-47bb-0310-9956-ffa450edef68
Amendment to OOZIE-1440 to remove unnecessary version in pom

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