Merge -r 1407432:1407433 from trunk to branch. Fixes: YARN-183. Clean up fair scheduler code. Contributed by Sandy Ryza.