Fix minor compile errors introduced while backporting from master branch
Manual test of TestVersionSemanticsNOUI
TestVersionSemanticsNOUI: Add tests against v2.2.3