Merge -r 584829:584830 from trunk into branch 15 to change the location of the HADOOP-2036 change message.