Preparing to branch hadoop-2.6