Merge remote-tracking branch 'hyracks-local/master' into hyracks-merge2