apns-conf.xml drifting away from cm

Change-Id: Icbfb18f5d74c9821da400961311c131a065ebc86