Merge "Revert "resourceloader: Add support for variables in WikiModule""