CLC-3576 Fix logout on machines where dev login mode is enabled
Merge pull request #2357 from ctweney/clc-3576

CLC-3576 Fix logout on machines where dev login mode is enabled
CLC-3579 Convert DateTimes to_time before using to_i, to work around Rails to_i conversion bug
Merge pull request #2358 from ctweney/clc-3579

CLC-3579 Convert DateTimes to_time before using to_i, to work around Rai...