Merge of Upstream version, updates version to 2.6.0.OSGi-SNAPSHOT