Added osgi-datasources-feature and fixed version replacement