Fixed bad merge of reboot and waypoint in runhil.