Cc nfs fix

This includes both the SAML login fix along with the CC NFS fix.

Thanks,
Ryan