Merged hyracks_dev_next r1183:r1207.

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