Merged hyracks_asterix_stabilization r2564:r2569.

git-svn-id: https://hyracks.googlecode.com/svn/branches/hyracks_lsm_tree@2572 123451ca-8445-de46-9d55-352943316053
4 files changed