Merge "resourceloader: Add $context to static functions in ResourceLoader"

diff --cc includes/resourceloader/ResourceLoader.php
Simple merge

diff --cc includes/resourceloader/ResourceLoaderClientHtml.php
Simple merge

diff --cc includes/resourceloader/ResourceLoaderContext.php
Simple merge

diff --cc includes/resourceloader/ResourceLoaderFileModule.php
Simple merge

diff --cc includes/resourceloader/ResourceLoaderLanguageDataModule.php
Simple merge

diff --cc includes/resourceloader/ResourceLoaderModule.php
Simple merge

diff --cc includes/resourceloader/ResourceLoaderStartUpModule.php
Simple merge

diff --cc includes/resourceloader/ResourceLoaderUserDefaultsModule.php
Simple merge

diff --cc includes/resourceloader/ResourceLoaderUserOptionsModule.php
Simple merge

diff --cc includes/resourceloader/ResourceLoaderUserTokensModule.php
Simple merge

diff --cc tests/phpunit/includes/resourceloader/ResourceLoaderTest.php
Simple merge