Merge "Remove hardcoded CloudOwner from heatbridge"