Merge "Change directory where apns-conf.xml is stored" into pi-dev