Merge asterix_stabilization_api_cleanup r1498:r1504.

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