merge asterix_lsm_stabilization into asterix_lsm_stabilization_managix r1473:1496

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