merge YARN-383 from trunk. AMRMClientImpl should handle null rmClient in stop(). Contributed by Hitesh Shah.


git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1443700 13f79535-47bb-0310-9956-ffa450edef68
merge YARN-385 from trunk. Add missing fields - location and #containers to ResourceRequestPBImpl's toString(). Contributed by Sandy Ryza.


git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1443704 13f79535-47bb-0310-9956-ffa450edef68
Merge branch 'branch-2' of github.com:griddynamics/yhadoop-common into branch-2-gd
Merge branch 'branch-2-gd' of github.com:griddynamics/yhadoop-common into fb-YAHOO-162-branch-2-gd