Clean up redirect logic
Merge pull request #5930 from edx/will/logistration-handle-redirects

Logistration: Clean up redirect logic