Portal + templates: Bug fix = when the user selects a template, then go back to select a service for which no template applies, he still gets the tempate fields in the final form.
Portal + templates: Bug fix = when the user selects a template, then go back to select a service for which no template applies, he still gets the tempate fields in the final form.

ucbpi/itop,ucbpi/itop,ucbpi/itop,ucbpi/itop,ucbpi/itop