BLXVIII-146 many fixes in EpicsTrajectoryScanRealPositionReader to get it to work. The logic to store the positions in a 2D scan did not work.
Merge remote-tracking branch 'origin/8.36'