Merge "Fix dep tests to work with both Karaf 3/4"