Tidy up SortXAxis, remove additional workspace left in ADS

Refs #10568
Merge branch 'bugfix/10568_sort_x_axis_produces_additional_workspaces' into develop