Merge "Add tests for SkinTemplate::setupSkinUserCss"