Merge branch 'measure-analysis' into packet-exchange

measure-analysis/measure-analysis.py

@@ -378,10 +378,12 @@ class MeasureSet:
 
             if cyclictest:
                 data = MeasureSet.parse_cyclictest(infile)
-                data['metadata'] = self.input_metadata()
             else:
                 data = json.load(infile)
 
+            self.metadata.update(data['metadata'])
+            data['metadata'] = self.input_metadata()
+
             measure_type = data['measure_type']
             units = data['units']
             metadata = data['metadata']