CON-747 | Refactor loadJs function from Oasis to not use WikiaScriptLoader
CON-747 | Some changes after CR
Fixes after CR
Fixes after CR (2)
Fixes after CR (3)
Merge remote-tracking branch 'origin/dev' into CON-747

Conflicts:
	skins/oasis/modules/OasisController.class.php
CON-747 | Post-merge fix
Merge pull request #3125 from Wikia/CON-747

CON-747 | Refactor loadJs function from Oasis to not use WikiaScriptLoader