porting changes from release-240

Conflicts:
	includes/cache/MemcachedSessions.php
porting changes from release-240

Conflicts:
	includes/cache/MemcachedSessions.php
Merge pull request #4648 from Wikia/dev-platform-308-porting-changes

Dev platform 308 porting changes