Fix import error.
Autocreate + put users in tenant.
Merge pull request #1 from enolfc/stable/grizzly

Create users in default tenant
Changes for stable/havana