Ensure user and tenant enabled in EC2

Fixes bug 1121494.

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