Drop goofy call in acl model
Merge hotfix on 'token-auth' into staging