Maven and Tycho Versioning fixes