Merge "Expose RL modules and js config vars in action=expandtemplates"