PLA-119 update grouping set to increment number of results when we have a match
PLA-119 added test for new grouping set logic
PLA-119 added logic to increment number of results found any time there is a match for ungrouped result sets too
Merge branch 'PLA-119' into dev