merge from zheilbron/hyracks_msr
96 files changed