1.4.1 behaviour changed

First of all, thanks for all the work on the 1.3 series!

This pull request is incomplete. I was hoping you would know how to fix `testMasterSwitchDuringSessionExpiration`...

Edit: Turns out all tests pass on my Jenkins server!  Don't know why it failed on my macbook...