Waypoint arrival

Change waypoint arrival code to remove references to sailing and replace with AdvanceRouteWaypointOnArrivalOnly to make code and display more consistent