Merge "Revert "Remove setup_credentials from orchestration tests""