refactor CXF config to work with Swagger
Merge remote-tracking branch 'origin/master'