Bug #2800: Fix template and service template update for inputs containing < or >