Minor fixes, CXF version bump to 2.7.2