Merged asterix_stabilization r440:r451.

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