fixes AWS compatibility issue with user creation - EUCA-9467
Merge branch 'dev/shaon/EUCA-9467' into testing