cherry pick 9308cd32227e6eb2cd90d5f7e85bc7866d7867ee
fix ui changing in filter
allow reports to include archived users; set submission history to use that
Merge branch 's-hist' into staging2