Merge "Fix oslo_debug_helper not running"