Make things as pretty as possible while moving to current openstack Y cycle tests. Change-Id: I22777cf34888171daf69c44705d8ecc7339f8278
Change-Id: I50774641757af1a608ebf739a7f171725bd4f9ec
Change-Id: Iac06fc379d11972601c362619b0d02e7839449d5