fixed the 'Assessments With Measures' queries. They were working for me locally but on test and production they were throwing 'must appear in the GROUP BY clause' errors. refs #10786
Merge branch 'master' into batou