Add 'group by ... keeping ...' as a synonym of 'group by ... with ...'.

Change-Id: I9aa7354092e13d7a95a3ab0ee4b02a468dbf3baf
Reviewed-on: http://fulliautomatix.ics.uci.edu:8443/187
Tested-by: Jenkins <jenkins@fulliautomatix.ics.uci.edu>
Reviewed-by: Till Westmann <westmann@gmail.com>
diff --git a/asterix-app/src/test/resources/AQLTS/queries-sql-like/functionDecl1.aql b/asterix-app/src/test/resources/AQLTS/queries-sql-like/functionDecl1.aql
index 9a77c84..c9e9231 100644
--- a/asterix-app/src/test/resources/AQLTS/queries-sql-like/functionDecl1.aql
+++ b/asterix-app/src/test/resources/AQLTS/queries-sql-like/functionDecl1.aql
@@ -2,11 +2,11 @@
 from $event in $events
 from $sponsor in $event.sponsoring_sigs
 with $es := { "event": $event, "sponsor": $sponsor }
-group by $sig_name := $sponsor.sig_name with $es
+group by $sig_name := $sponsor.sig_name keeping $es
 with $sig_sponsorship_count := count($es)
 with $by_chapter :=
    from $e in $es
-   group by $chapter_name := $e.sponsor.chapter_name with $es
+   group by $chapter_name := $e.sponsor.chapter_name keeping $es
    select { "chapter_name": $chapter_name, "escount" : count($es) }
 order by $sig_sponsorship_count desc
 limit 5