Fix for USERGRID-2395 "Superuser & test user should not have to confirm or be activated" plus some tests to prove it.
https://apigeesc.atlassian.net/browse/USERGRID-2395
Merge pull request #230 from apigee/USERGRID-2395-2

Superuser & test user should not have to confirm, take #2