Merge "Don't show error on ACL modification if a section is added more than once"