[KARAF-2120] - revert changes of KARAF-1305 for 2.2.x


git-svn-id: https://svn.apache.org/repos/asf/karaf/branches/karaf-2.2.x@1434477 13f79535-47bb-0310-9956-ffa450edef68