Bumped a couple of plugin versions, and removed a couple of overridden versions.



git-svn-id: https://svn.apache.org/repos/asf/felix/trunk@1636551 13f79535-47bb-0310-9956-ffa450edef68