Merge pull request #2066 from nextcloud/fix-redirect-double-encoding

do not double encode the redirect url

diff --cc lib/private/AppFramework/Middleware/Security/SecurityMiddleware.php
Simple merge

diff --cc lib/private/legacy/util.php
Simple merge

diff --cc tests/lib/AppFramework/Middleware/Security/SecurityMiddlewareTest.php
Simple merge