a npe fix and polished cxf cdi quickstarts