Fixed a couple dependency issues that cropped up due to changes in karaf trunk.