Merge "Workaround for karaf bug KARAF-3069"