Changes to Yarn branch from Cloudera for CDH5 and MR2