Merge pull request #541 from john-hill/PLFM-1978

fixed
Revert the change that removes the syn prefix from the ID of the ACL
Merge pull request #546 from eric-wu/release-3

Revert the change that removes the syn prefix from the ID of the ACL
Merge patch from release-3 into develop