FABRIC-672  clean up the fabric-cxf-demo and polish the fabric-itest-common code