[PPP-3244] / [PPP-11944] - Version check fixes
[PPP-3244] / [PDI-11944] - Version check fixes.
Merge pull request #1503 from mbatchelor/master

[PPP-3244] / [PDI-11944] - VersionCheck fixes