GitLab

ACL will be used when configured.
An unrelated change was piggy-backed: the ACL check was moved outside of
the try-except block.  it doesn't make sense to return FORMERR when an
exception is raised in the ACL check.
Also some minor style fixes were made (folding some long lines)