The domain_remap middleware didn't need to change, only its tests. Change-Id: I5edf05b609ce263708f851219c38c1bd1b645a6f