Added branch for fixing aggregation rewrites.

git-svn-id: https://asterixdb.googlecode.com/svn/branches/asterix_fix_agg@492 eaa15691-b419-025a-1212-ee371bd00084