Use new OutputPageScriptsForBottomQueue hook

At the same time, load both modules unconditionally;
those conditions are now located in the modules themselves.
OutputPage will check if the module is empty before
actually loading it.

Depends on Ifccac7889 in mediawiki-core.

Bug: 62602
Change-Id: Ie70903f0491c76ee776518d8268e5a3e351daec7
Merge "Use new OutputPageScriptsForBottomQueue hook"