Lp/1182384

BackPorting following changes for JioCloud-Stable/Havana Tempest test 

https://bugs.launchpad.net/tempest/+bug/1182384.