More updates to support CXF 3.0.0