Signed-off-by: Umesh Agashe <uagashe@cloudera.com> Signed-off-by: Yu Li <liyu@apache.org> Conflicts: hbase-server/src/main/java/org/apache/hadoop/hbase/quotas/FileArchiverNotifierFactoryImpl.java hbase-server/src/main/java/org/apache/hadoop/hbase/quotas/FileArchiverNotifierImpl.java