Code cleanup

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