Merge "Remove duplicate import of hashlib"

diff --cc deploy/deploy-config.py
index d02a937,7e79b9d..65d51b2
--- 1/deploy/deploy-config.py
--- 2/deploy/deploy-config.py
+++ b/deploy/deploy-config.py
@@@ -86,11 -86,10 +86,10 @@@ def warning(msg)
                                                 'NC': NC})
  
  def setup_yaml():
 -  represent_dict_order = lambda self, data:  self.represent_mapping('tag:yaml.org,2002:map', data.items())
 -  yaml.add_representer(collections.OrderedDict, represent_dict_order)
 +    represent_dict_order = lambda self, data:  self.represent_mapping('tag:yaml.org,2002:map', data.items())
 +    yaml.add_representer(collections.OrderedDict, represent_dict_order)
  
  def sha_uri(uri):
-     import hashlib
      response = urllib2.urlopen(uri)
      data = response.read()
      sha1 = hashlib.sha1()