PROV-1095 Now update ResultContext properly if result order has changed
Merge branch 'develop' into dev/exportUIRework

* develop:
  PROV-1095 Now update ResultContext properly if result order has changed