Add deployment_id to ACL names, whitespace fix for cfg syncing regex definitions