OOZIE-1395 Using Yarn's CapacityScheduler causes some tests to time out (rkanter)

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