Merge branch 'branch-2-gd' of https://github.com/griddynamics/yhadoop-common into fb-YAHOO-276-branch-2-gd

Conflicts:
	hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-app/src/test/java/org/apache/hadoop/mapreduce/v2/app/webapp/TestAppController.java