All the expected query changes from Review Board 5 have now been merged

into Review Board 6. This has led to regressions in unit tests that had

outdated expected queries.
This change updates those queries to incorporate join types and to make

use of expected query helpers.
There's still much to do to clean up expected queries, but for now, this

unbreaks the build.

Unit tests pass.