HADOOP-9768. Merging change r1508527 from trunk to branch-2.
HADOOP-9768. Merging change r1508527 from trunk to branch-2.

git-svn-id: 87fadc70c6d1ec4cad1ab866a1bdcf2d7235de87@1508531 13f79535-47bb-0310-9956-ffa450edef68

robzor92/hops,robzor92/hops,robzor92/hops,srijeyanthan/hops,robzor92/hops,gigaroby/hops,srijeyanthan/hops,srijeyanthan/hops,smkniazi/hops,hopshadoop/hops,robzor92/hops,srijeyanthan/hops,srijeyanthan/hops,gigaroby/hops,srijeyanthan/hops,smkniazi/hops,hopshadoop/hops,gigaroby/hops,hopshadoop/hops,robzor92/hops,robzor92/hops,smkniazi/hops,hopshadoop/hops,srijeyanthan/hops,gigaroby/hops,robzor92/hops,hopshadoop/hops,hopshadoop/hops,gigaroby/hops,gigaroby/hops,hopshadoop/hops,smkniazi/hops,smkniazi/hops,srijeyanthan/hops,gigaroby/hops,smkniazi/hops,smkniazi/hops,smkniazi/hops,hopshadoop/hops,gigaroby/hops