Fix CtnrUser creation failure in certain cases

If the user was already in the 'global' container as a user or admin,
promoting them to superuser would succeed but adding them as a 'global'
admin would fail.
Make error messages more correct
Merge pull request #709 from drkitty/fix-promotion-bug

Fix user promotion bug. Functional, tests pass, merging.