pep8 changes only
RCSS-6 Don't return to logout URLs. If the return url should be one of those specified, return to portal root