AMBARI-4074. Fix mapred-site.xml configs. (yusaku)

Conflicts:
	ambari-server/src/main/resources/stacks/HDP/1.3._/services/MAPREDUCE/configuration/mapred-site.xml