Merge "scenario test involving glance, cinder and nova functionalities"