HDFS-7560. ACLs removed by removeDefaultAcl() will be back after NameNode restart/failover. Contributed by Vinayakumar B.

(cherry picked from commit 2cf90a2c338497a466bbad9e83966033bf14bfb7)