Merged fullstack_asterix_stabilization -r 2770:2771

git-svn-id: https://hyracks.googlecode.com/svn/branches/fullstack_staging@2772 123451ca-8445-de46-9d55-352943316053