Fixed issue #7827: Ampersands in end url are encoded for non-admins
Merge remote-tracking branch 'origin/master'
Fixed issue #7807: Error when deactivating survey