merge from zheilbron/hyracks_msr
95 files changed