Merge "Enable ControllerExecutionBB for service scope"

No match.