Merge https://github.com/Azure/sonic-utilities

Author: Tyler Li

.github/PULL_REQUEST_TEMPLATE.md

@@ -8,6 +8,11 @@ If this is a bug fix, make sure your description includes "closes #xxxx",
 "fixes #xxxx" or "resolves #xxxx" so that GitHub automatically closes the related
 issue when the PR is merged
 
+If you are modifying or removing an existing 'show', 'config' or 'sonic-clear'
+subcommand, or you are adding a new subcommand, please make sure you also
+update the Command Line Reference Guide (doc/Command-Reference.md) to reflect
+your changes.
+
 Please provide the following information:
 -->
 

acl_loader/main.py

@@ -48,7 +48,8 @@ class AclLoader(object):
     ACL_RULE = "ACL_RULE"
     ACL_TABLE_TYPE_MIRROR = "MIRROR"
     ACL_TABLE_TYPE_CTRLPLANE = "CTRLPLANE"
-    MIRROR_SESSION = "MIRROR_SESSION"
+    CFG_MIRROR_SESSION_TABLE = "MIRROR_SESSION"
+    STATE_MIRROR_SESSION_TABLE = "MIRROR_SESSION_TABLE"
     POLICER = "POLICER"
     SESSION_PREFIX = "everflow"
 
@@ -130,9 +131,9 @@ def read_sessions_info(self):
         Read MIRROR_SESSION table from configuration database
         :return:
         """
-        self.sessions_db_info = self.configdb.get_table(self.MIRROR_SESSION)
+        self.sessions_db_info = self.configdb.get_table(self.CFG_MIRROR_SESSION_TABLE)
         for key in self.sessions_db_info.keys():
-            state_db_info = self.statedb.get_all(self.statedb.STATE_DB, "{}|{}".format(self.MIRROR_SESSION, key))
+            state_db_info = self.statedb.get_all(self.statedb.STATE_DB, "{}|{}".format(self.STATE_MIRROR_SESSION_TABLE, key))
             if state_db_info:
                 status = state_db_info.get("status", "inactive")
             else: