CAS-1249

update code to use ClientInfo and ClientInfoHodler which already include support for using an alternative header.  This makes it consistent with the other code.