merge r3038:3100 fullstack_asterix_stabilization -> fullstack_lsm_staging

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