Update apnsservice to parse template in APN compatible way
Address review feedback from andrerod
Merge pull request #1275 from toddreifsteck/dev

Update apnsservice to parse template in APN compatible way