Replace all the matterhorn libs for OSGI dependency reasons