Merge "Migrate scenario tests ssh-auth-strategy"