test fix. plone.session expects encoded userids
Preparing release 2.3.7
Back to development: 2.3.8
Merge remote-tracking branch 'upstream/2.3.x' into 2.3.x