Ensure user and tenant enabled in EC2

Fixes bug 1121494.

Change-Id: If7277f0b4a55aa5be81b354cd4c7ed338a600a62
Merge "Ensure user and tenant enabled in EC2"