SM-2320: Upgrade to Karaf 2.3.6