Merge "Use the embedded scenario manager instead of tempest one"