Merge "resourceloader: Minor clean up in mw.loader and mw.html"