Porting Python2 to Python3 (small fixes)

Author: GabrielBrascher

systemvm/debian/opt/cloud/bin/cs/CsApp.py

@@ -1,4 +1,4 @@
-    # -- coding: utf-8 --
+# -- coding: utf-8 --
 # Licensed to the Apache Software Foundation (ASF) under one
 # or more contributor license agreements.  See the NOTICE file
 # distributed with this work for additional information

systemvm/debian/opt/cloud/bin/cs_dhcp.py

@@ -26,7 +26,7 @@ def merge(dbag, data):
             del(dbag[data['ipv4_address']])
     else:
         remove_keys = set()
-        for key, entry in dbag.iteritems():
+        for key, entry in dbag.items():
             if key != 'id' and entry['mac_address'] == data['mac_address']:
                 remove_keys.add(key)
                 break