Merge "resourceloader: Move queue formatting out of OutputPage"

diff --cc autoload.php
Simple merge

diff --cc includes/OutputPage.php
Simple merge

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