merged from asterix_stabilization r545:551

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