CMS-3536 Wizard does not close when user choose Yes upon save and close