Merged asterix_stabilization r945:r952.

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