CRM-9483, CRM-8765, CRM-12648 fix intermittant session bug & offshoot
probs

Conflicts:

	CRM/Core/Session.php