Merge "Fix for bug 8695466 GPOS combining mark positioning broken before space" into jb-mr2-dev