Merged asterix_stabilization r250:r262.

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