Issue 4452 - updateUpdateManifests script errors out failing to import get_certificates_and_key

sitescripts/extensions/bin/updateUpdateManifests.py

Index: sitescripts/extensions/bin/updateUpdateManifests.py
===================================================================
--- a/sitescripts/extensions/bin/updateUpdateManifests.py
+++ b/sitescripts/extensions/bin/updateUpdateManifests.py
@@ -22,18 +22,18 @@ Generate update manifests
 
 import os
 import re
 import sys
 import subprocess
 from ConfigParser import SafeConfigParser
 
 from buildtools.packagerGecko import KNOWN_APPS
-from buildtools.packagerSafari import (get_developer_identifier,
-                                       get_certificates_and_key)
+from buildtools.packagerSafari import get_developer_identifier
+from buildtools.xarfile import read_certificates_and_key
 
 from sitescripts.utils import get_config, get_template
 from sitescripts.extensions.utils import (
     Configuration, getDownloadLinks,
     writeIEUpdateManifest, writeAndroidUpdateManifest)
 from sitescripts.extensions.android import get_min_sdk_version
 
 
@@ -50,17 +50,17 @@ def readMetadata(repo, version):
         return {
             'revision': revision,
             'version': version,
             'minSdkVersion': get_min_sdk_version(repo, version),
             'basename': os.path.basename(repo.repository)
         }
     elif repo.type == 'safari':
         metadata = repo.readMetadata(version)
-        certs = get_certificates_and_key(repo.keyFile)[0]
+        certs = read_certificates_and_key(repo.keyFile)[0]
 
         return {
             'certificateID': get_developer_identifier(certs),
             'version': version,
             'shortVersion': version,
             'basename': metadata.get('general', 'basename'),
             'updatedFromGallery': True
         }