Issue #3488681 by dcam, jazzsequence, mradcliffe, nicxvan, quietone, mmenavas, heilop: Fix defgroup open and close that were separated during Hook conversion