fixed bad detection of change on default and premature break
Merge pull request #6501 from bcoca/acl_fix_change_detection

fixed bad detection of change on default and premature break