Cherry-pick of 5d671a8 onto stable5.

recreate an etag within the scanner if the cache contains an empty etag

Conflicts:
	lib/files/cache/cache.php
	tests/lib/files/cache/scanner.php