CONN-207: CXF 2.7.3 upgrade changes