ContainmentPathElement: made annexName optional, removed inAnnex flag
Merge remote-tracking branch 'origin/mm-updates' into develop