Template registration improvements

Fix flow of Expiry for APNS templates and ensure Expiry and TemplateName can be round-tripped or passed through for all template registrations