Merge branch 'dmem0.2' of https://github.com/jackbauer35/hadoop-2.3.0-src-dmem into dmem0.2

Conflicts:

	hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/monitor/RMCustomizationAgent.java