This is in preparation for spinning up a staging/QA matrix instance, where the MXID domain is under control by hscloud machinery (and not a top-level organizational domain). Change-Id: I10505615ebb407b3b2eac0c1b87ad5625e2009c0