Merge "Improve tests for OutputPage::makeResourceLoaderLink"