Deal with MDEvents. Refs #8706
Merge remote branch 'origin/bugfix/8706_SaveUB_MDEvents'