Replace org.apache.felix OSGi dependencies with org.osgi dependencies + Upgrade OSGi from 4.1.0 (hidden in felix's 1.4.0 jars) to 4.3.1