queryservice_test: Fix for MariaDB differences
Merge branch 'vtocc'