CLC-3215 Revert earlier commits - still one redirect hole unfilled

Need to revert this ASAP to re-enable normal login on Dev.

The problem seems to be in Omniauth CAS incorrectly assuming the http: protocol in its "service" argument.