Karaf builder cleanup and fixes