CILogon 2.0 update

OOIION-1406

@jamie-cyber1 please review and merge