Merge "Fix heat service availability config option name"