merged r1380:1386 from hyracks_asterix_stabilization

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