HDFS-5417. Fix storage IDs in PBHelper and UpgradeUtilities.


git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/HDFS-2832@1535791 13f79535-47bb-0310-9956-ffa450edef68