Tidy up SortXAxis, remove additional workspace left in ADS

Refs #10568
Merge remote-tracking branch 'origin/bugfix/10568_sort_x_axis_produces_additional_workspaces'