refs #33124
Merge remote-tracking branch 'origin/bugfix/acl_inactive_application'

Conflicts:
	portlets/accessctl/src/main/java/com/aimluck/eip/accessctl/util/AccessControlUtils.java