YARN-1083. Changed ResourceManager to fail when the expiry interval is less than the configured node-heartbeat interval. Contributed by Zhijie Shen. svn merge --ignore-ancestry -c 1518036 ../../trunk/