merged asterix_stabilization into branch -r1345:1361.

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