Include slavename in properties.legacy()

recipe_modules/properties/api.py

 # Copyright 2013 The LUCI Authors. All rights reserved.
 # Use of this source code is governed under the Apache License, Version 2.0
 # that can be found in the LICENSE file.
 
 from recipe_engine import recipe_api
 from recipe_engine.types import freeze
 import collections
 
 # Use RecipeApiPlain because collections.Mapping has its own metaclass.
 # Additionally, nothing in this class is a composite_step (nothing in this class
@@ skipping 24 matching lines @@
   def __getitem__(self, key):
     return self._properties[key]
 
   def __len__(self):
     return len(self._properties)
 
   def __iter__(self):
     return iter(self._properties)
 
   def legacy(self):  # pragma: no cover
-    """Returns a reduced set of properties, possibly used by legacy scripts."""
+    """Returns a set of properties, possibly used by legacy scripts."""
 
     # Add all properties to this blacklist that are required for testing, but
     # not used by any lecacy scripts, in order to avoid vast expecation
     # changes.
     blacklist = set([
       'buildbotURL',
     ])
-    return {k: v for k, v in self.iteritems() if k not in blacklist}
+    props = {k: v for k, v in self.iteritems() if k not in blacklist}
+    if props.get('bot_id') and not props.get('slavename'):
+      props['slavename'] = props['bot_id']
+    return props
 
   def thaw(self):
     """Returns a vanilla python jsonish dictionary of properties."""
     return self.properties_client.get_properties()