Merge "Add operator role to heat stack owner"