Add remoting checks for merge, Move to merge call which returns updated transient object
#5225 Replace saveOrUpdate with merge for new entity wizards
Aligning Editor with 3.3 model changes. First phase commit which updates only the classes. Branch not compilable at the moment.
Fixed #2435
had to rename the packages to make them compliant with buckminster