Issue #8529 by cableman: Removed survey from the site
Issue 8757 by sgl: Handle empty sessionsid as in drupal 7
Merge branch 'hotfix_emptysessionid' into development