Updated CXF version (to 2.7.11), removed work-arounds