- Add 'order by' to various queries containing 'group by'. This is
  required for NDB to stabilize the output of the ps_7ndb test
- Update result files of various tests that use the ps_query include
  file