Bug 1495200 & Bug 1496681

behatnotneeded: Well, we could test this, but it would
require a 60-second wait for the session to timeout (since
the least you can set the session timeout via the UI
is 1 minute)

Change-Id: Ia5c861c16b6c893ada9d5eb2111f0b6a9aee49ad