MAPREDUCE-3197. TestMRClientService failing on building clean checkout of branch 0.23 (mahadev) - Merging r1185486 from trunk