Merge branch 'master' into remove-kpi

force_bdss/core/output_slot_info.py

@@ -16,4 +16,4 @@ class OutputSlotInfo(HasStrictTraits):
 
     #: True if the value associated to this output slot must be exported as
     #: a KPI.
-    kpi = Bool(False)
+    is_kpi = Bool(False)

force_bdss/data_sources/tests/test_base_data_source_model.py

@@ -61,12 +61,12 @@ class TestBaseDataSourceModel(unittest.TestCase):
                     {
                         "__traits_version__": "4.6.0",
                         "name": "baz",
-                        "kpi": False
+                        "is_kpi": False
                     },
                     {
                         "__traits_version__": "4.6.0",
                         "name": "quux",
-                        "kpi": False
+                        "is_kpi": False
                     }
                 ]
             })