Merge "Migrate scenario utils to tempest client"