Make IS versioning work identical to OSGi versioning
Update merge from local master.