[CXF-5705] Some refactoring around client authentication support