Properly handle '/login?redirect=<URL>'
Merge branch 'master' of https://github.com/iPlantCollaborativeOpenSource/troposphere