Merge branch 'yingyi/asterix_fix' of https://code.google.com/p/asterixdb into yingyi/asterix_fix