Remove servlet-api dependency (replaced by the geronimo spec one)
Merge branch 'karaf-3.0.x' of https://git-wip-us.apache.org/repos/asf/karaf into karaf-3.0.x