Backport RestrictSessions and CheckpointCharlie
Merge pull request #4430 from Wikia/release-238-restrict-charlie

Backport RestrictSessions and CheckpointCharlie