Merge "Web installer should not pollute global namespace with session variables"