merge tjoneslo: Fix the test-query-combo-1 YAML test.
merge tjoneslo: Fix the test-query-combo-1 YAML test.

https://code.launchpad.net/~tjoneslo/akiban-server/test-query-combo-1-fix/+merge/129335
shunwang/sql-layer-1,relateiq/sql-layer,wfxiang08/sql-layer-1,ngaut/sql-layer,relateiq/sql-layer,wfxiang08/sql-layer-1,relateiq/sql-layer,jaytaylor/sql-layer,qiuyesuifeng/sql-layer,jaytaylor/sql-layer,ngaut/sql-layer,shunwang/sql-layer-1,jaytaylor/sql-layer,qiuyesuifeng/sql-layer,jaytaylor/sql-layer,wfxiang08/sql-layer-1,shunwang/sql-layer-1,shunwang/sql-layer-1,wfxiang08/sql-layer-1,relateiq/sql-layer,qiuyesuifeng/sql-layer,ngaut/sql-layer,qiuyesuifeng/sql-layer,ngaut/sql-layer