Merge branch 'msaur_xibmtoxim2pi_ombmtoomm2pi' into 'master'
Charmless XibmToXim2h and OmbmToOmm2h
See merge request !1767 (merged)
(cherry picked from commit 7b7291f2)
676e6137 Charmless XibmToXim2h and OmbmToOmm2h 70f5e55c Ombm_OmmKpPim,OmmToL0Km update