Merge branch 'core-future' into core-rest-flask

daemon/core/broker.py

@@ -1163,5 +1163,5 @@ class CoreBroker(ConfigurableManager):
         control_nets = map(lambda x: "%s:%s" % (x[0], x[1]), zip(servers, control_nets))
         values[index] = "controlnet=%s" % (" ".join(control_nets))
         values_str = "|".join(values)
-        message.tlvdata[ConfigTlvs.VALUES.value] = values_str
+        message.tlv_data[ConfigTlvs.VALUES.value] = values_str
         message.repack()

daemon/core/future/coreemu.py

@@ -856,7 +856,6 @@ class CoreEmu(object):
         self.sessions = {}
 
         # set default nodes
-        # set default node map
         node_map = nodemaps.NODES
         nodeutils.set_node_map(node_map)