scans benchmark: refactor for apprunner: add --test parameter to run tests individually; fix index scan query
This makes TestAdHocQueries pass on my desktop.  I don't know why, and
I no longer care, I just need closure.
Merge branch 'master' into ENG-4929-joins-and-unions