LPS-35935

Hi,

I tried to rename the CSRF "context" to "origin". I don't know if Brian accepts that, but at least it's rebased and you can see all the places that need to be changed :)

Thanks.