Merged asterix_stabilization r585:r605.

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