Issue #2417645 by tim.plunkett, effulgentsia, pwolanin: Change destination query string handling to break dependence on system path