merge from asterix_lsm_stabilization rev 1451:1456

git-svn-id: https://asterixdb.googlecode.com/svn/branches/asterix_lsm_stabilization_managix@1457 eaa15691-b419-025a-1212-ee371bd00084