Merge "Support acceptance tests running with different configs"