Merge "Check content of non-null URLs in testGetEntryUrlOrNull"