Upgrade to Karaf 2.3.1