MDL-37683 cache: siteidentifier is now included in the keys

Conflicts:
	lib/db/upgrade.php
	lib/moodlelib.php
	version.php