Upgrade to karaf 2.3.6