Log errors instead of calling trigger_error()
Merge pull request #2727 from rchavik/2.5-remove-acl-trigger-errors

Log errors instead of calling trigger_error()