Code cleanup

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