TEZ-1039. Add Container locality to TaskScheduler (bikas)
Merge remote branch 'origin/apache-ref/master' into champlain