SSO: fix redirect issue based on userspace: URL's are now all dynamically generated.
Merge branch 'dev' of github.com:AADevTeam/aaproto into dev