Upgrade to Karaf 2.3.6