Merge "Add merge utility for service templates"