Merged asterix_stabilization r269:r313.

git-svn-id: https://asterixdb.googlecode.com/svn/branches/asterix-fix-issue-9@314 eaa15691-b419-025a-1212-ee371bd00084