SWC-1246: fix column data if node query service results
and maintain return column order
new tests
Merge pull request #870 from jay-hodgson/SWC-1246

SWC-1246: fixes for query table widget