HIVE-7068 Fix cq maps. Get closer to a successful qtest.