Merge "Changing RuntimeException on old-apns-conf file not found to error msg."