Refs #8250 fix merge conflict
Deal with MDEvents. Refs #8706
Merge branch 'bugfix/8706_SaveUB_MDEvents' into develop