Merge "Segregate right to edit sitewide CSS/JS"