MODE-2005 Additional tests and fixes for the versioning behavior
MODE-2005 Additional fixes for merging.
Updated release notes
Changed version to 3.5-SNAPSHOT after 3.4.0.Final release