CMS-3769 Some minor changes to karaf distro.