Merge "Need to have stable tempest scenario manager"