Still working on SSL termination integration tests, and cleaning up SSL logic as I go.
Had a merge conflict; fixed by removing my change.