HDFS-4413. Secondary namenode won't start if HDFS isn't the default file system. Contributed by Mostafa Elhemali.

git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-1@1466322 13f79535-47bb-0310-9956-ffa450edef68
HADOOP-9467. Metrics2 record filter should check name as well as tags. (Ganeshan Iyler via llu)

git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-1@1466385 13f79535-47bb-0310-9956-ffa450edef68