fixes missing caller
fixes timeoutable specs to cover sign_out_all_scopes false
Merge pull request #2750 from louman/master

Timeoutable - fixes missing caller