(Bug 57360) Fix serializer to emit "|}" in SOL posn

* Had to hack serializer a bit for some edge cases.
* Updated parser tests.
* 8 selser tests now green.

Change-Id: Iba60e19d2e7fe470554f538c1a799150157199e1
Merge "(Bug 57360) Fix serializer to emit "|}" in SOL posn"