using the same CXF version used by linagora to avoid conflict exceptions
services client test now deploys jar, not war
Merge branch 'master' of https://github.com/choreos/choreos_middleware