TRUNK-3644 Strip off qualifier when comparing versions

(cherry picked from commit 36f2c8da3e5c32ae836d4bb318d6b445e8062e2a)