UHM-1528: Dispensing location: remove trailing hyphen if no location specified