form bug fixes
Merge branch 'master2'

Conflicts:
	module/Content/src/Content/ContentForm/Model/ProductsTable.php
form bug fixes