Merge "Sync heat domain name with keystone defined"