#1559: feature-cxf should include fabric-cxf, this fixes some of the cxf...

... archetypes too.