svn merge -c 1396798 FIXES: HDFS-3224. Bug in check for DN re-registration with different storage ID. Contributed by Jason Lowe