Merge pull request #1329 from Kenneth-T-Moore/herb_mm

Support for Variable Trees in Metamodel
Some timeout and checks hopefully fix intermittent failure when slotting.