Merge "OutputPage->getJSVars: Maintain symmetry between JS & PHP vars"