add apns-conf location
revert
Merge branch 'cm/cm-10.1'