MODE-2005 Additional tests and fixes for the versioning behavior

Incorporates the additional test from https://github.com/ModeShape/modeshape/pull/907 and fixes for the test failures.