Resolve conflicts between CB and Kunena backend (#1576)