[T4849][FIX] minor fixes when updating product.template

Merged Javier Vescio requested to merge T4849 into 17.0

Merge request reports