Merged asterix_stabilization r916:r950.

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