Atmire 1763 - Allow removal of vouchers/waivers (and atmire-1919 cramped waiver message)