Merged two changes from downstream, to change from dialog to whiptail