HBASE-10581: ACL znode are left without PBed during upgrading hbase0.94* to hbase0.96+

git-svn-id: https://svn.apache.org/repos/asf/hbase/trunk@1571519 13f79535-47bb-0310-9956-ffa450edef68
HBASE-10582: 0.94->0.96 Upgrade: ACL can't be repopulated when ACL table contains row for table '-ROOT' or '.META.'

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