Merged asterix_stabilization r953:r985.

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