merged r1393:1404 asterix_stabilization --> asterix_lsm_stabilization

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