Merge "Fix API version test to not assume dns endpoint"