Merge asterix_lsm_stabilization r1491:r1492.

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