[css-gaps-1] Fixes for gap intersection point definition and pairing algorithm. (w3c#11720)

* Revert commit f8b28b2
* Update pairing algorithm and other markup fixes
* Address PR comments

Author: kbabbitt