Merge pull request #634 from dburdick/swc-690

Swc 690
Fix the error handling for creating a user that already exists.
Change this URI back to how it was before my search and replace debacle XD
Merge pull request #642 from kaysoky/RegisterExistingErrorMessage

Error handling change
Adds a check for ToU acceptance after successful OpenID auth
Merge pull request #643 from kaysoky/OpenToUCheck

Fix for always showing ToU dialog after OpenID auth
swc-859 - restrict portal log level to info
Merge pull request #644 from dburdick/swc-859

swc-859 - restrict portal log level to info
SWC-996: redirect /dream to Challenge:DREAM place
Merge pull request #645 from jay-hodgson/SWC-996

SWC-996: redirect /dream to Challenge:DREAM place
Merge branch 'release-18' into develop