YARN-2171. Improved CapacityScheduling to not lock on nodemanager-count when AMs heartbeat in. Contributed by Jason Lowe. svn merge --ignore-ancestry -c 1605616 ../../trunk/