Merge pull request #1096 from nakomis/bump-cxf-version

Bumps cxf versions