Added affinityId cookie
Merge remote-tracking branch 'awd/master' into openid_improvements