various cleanups and fixes for cxf 2.7.14-SNAPSHOT