#5225 Replace saveOrUpdate with merge for new entity wizards
Fixed #2435
had to rename the packages to make them compliant with buckminster