svn merge -c 1332821 FIXES: HADOOP-8172. Configuration no longer sets all keys in a deprecated key list. (Anupam Seth via bobby)