Merge asterix_stabilization_issue_279 into asterix_stabilization branch.

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