hadoop-local-branch changes