[MONDRIAN-1770] Missed 2 added files with queryBuilder merge.