merge-update from trunk
rename FieldObservation -> FieldUnit #3566
removed commented code
updated wizard to return new DerivedUnit for given type
Aligning Editor with 3.3 model changes. First phase commit which updates only the classes. Branch not compilable at the moment.
Fixed #2435
Removing inappropriate method call
had to rename the packages to make them compliant with buckminster