allow backwards compat
Merge branch 'sessioncookieoptions' into develop