Query update for tpch columnstore benchmark

[mprostko]

Closes #480

This PR updates the queries for MariaDB's OLAP tests and fixes three failing queries. Fixed queries were backported from here.

[sm-shaw]

I have tested the changes on both mariadb columnstore and innodb storage engines and can confirm the queries run successfully on both.

In particular, retaining the original queries where we can and only changing them is closer to the original TPC-H specification that the workload is derived from. (As the specification doesn't permit rewriting)

[memmertoIBM]

In particular, retaining the original queries where we can and only changing them is closer to the original TPC-H specification that the workload is derived from. (As the specification doesn't permit rewriting)

The addition of correlation names (AS CLAUSE) is allowed as a "minor query modification" as per TPC-H 2.2.3.3 h).

That said, since the existing query text is not ambiguous in the first place, the need for additional correlation names in the MariaDB columnstore implementation indicates a problem with the MariaDB columnstore query parser, so this latest approach is best.