Assure that type's references to its row are not lost in the edit form template methods
Merge pull request #517 from Zentyal/jag/row-reference-lost-template

Assure that type's references to its row are not lost in the edit form t...
Merge branch '3.0'

Conflicts:
	main/core/ChangeLog