Merge "Orchestration API config tests"