Merge pull request #1272 from toddreifsteck/dev

Enable APN compatibility on apnsService
Update apnsservice to parse template in APN compatible way