HBASE-8259 Snapshot backport in 0.94.6 breaks rolling restarts

git-svn-id: https://svn.apache.org/repos/asf/hbase/branches/0.94@1464562 13f79535-47bb-0310-9956-ffa450edef68