Fixes shuttle ETA given before arrive_time is set
Merge pull request #6170 from mwerezak/shuttle-fixes

Fixes shuttle ETA being given before arrive_time is set
Merge remote-tracking branch 'upstream/master'