More merges from asterix_stabilization to asterix_stabilization_result_distribution.

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