fix for Cal
Merge remote-tracking branch 'kmoore/cal' into fix-vartree-expand
cpath_updated call moved into update_iovar_set
Added getattr in container.add_trait to force traits to correclt update.
Merge pull request #1483 from crobinsonut/fix-vartree-expand

Fix vartree expand