Merge branch 'hyracks' into hyracks-merge2