Supporting changes for TISTUD-6694
- store attributes by map of names to AttributeElements, not just a list of names. Allow lookup by name, getting full AttributeElement object