saltstack/salt — pull request #8981 by cachedout (2013-12-03 19:05:44+00:00)
Title: Avoid conflicting options.

If you're a superuser, you already have permissions to create a user. Postgres will complain about conflicting options if you attempt to pass both. Refs #8717.