Backport of fix for OPENAM-1857 - improve OSChecker OS version parsing.
Fix for OPENAM-1857, review CR-4625 - improve the OSChecker OS version parsing.