MAPREDUCE-6170. TestUlimit failure on JDK8. (bc Wong via kasha)
Merge remote-tracking branch 'remotes/origin/branch-1' into branch-1