Merge "Adjust for karaf 4 not happening in carbon"