merge -c 1504970 from trunk to branch-2 to fix YARN-919. Document setting default heap sizes in yarn env.sh Contributed by Mayank Bansal.