archiving unused branches
1) merge from asterix stabilization(r1194:1239)

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