Ensure user and tenant enabled in EC2

Fixes bug 1121494.

Change-Id: Ia9a149a93dec87f46b667100e0ee2eda56d9489d
Merge "Ensure user and tenant enabled in EC2" into stable/essex