Some work was done here. It is believed that was enough. However, the tests still fail even though "manual testing" via deployment to Karaf succeed. The local build tests were disabled. See HHH-9699 for follow up to fix and re-enable local tests