sort out parallel gateway var merge bug
move gateway persistance to divergent gateway rather than convergent gateway to use the correct base vars for merge. add more test coverage for parallel gateway.
move gateway persistance to divergent gateway rather than convergent gateway to use the correct base vars for merge. add more test coverage for parallel gateway.