Merge "Make scenario tests requiring admin skip if no admin creds"