CMS-3567 Refactor WizardPanel.close