Removed SiteAdmin and RedirectAdmin from the site_notes app since these
imports are not used
Another manual merge