Merge branch 'trunk' into HADOOP-12756