OOZIE-1397 failure in running test cases (aklochkov via rohini)

git-svn-id: https://svn.apache.org/repos/asf/oozie/trunk@1489245 13f79535-47bb-0310-9956-ffa450edef68
OOZIE-1298 TestPartitionDependencyManagerEhcache.testEvictionOnTimeToIdle is flakey (rohini)

git-svn-id: https://svn.apache.org/repos/asf/oozie/trunk@1489247 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