Merge branch 'FS-May242017' into '21.0'

ATR-16281

See merge request !2177

Trigger/TriggerCommon/TrigEDMConfig/python/testEDM.py

@@ -35,7 +35,7 @@ def main():
       print "ERROR, no final Aux. in label for " + serializable_name
     
     file_types = TriggerSerializable[1].split(" ")
-    allowed_file_types = ("", "BS", "DS", "ESD", "AODFULL", "AODSLIM", "AODVERYSLIM")
+    allowed_file_types = ("", "BS", "DS", "ESD", "AODFULL", "AODSLIM", "AODVERYSLIM", "AODBLSSLIM")
     for file_type in file_types:
       if not file_type in allowed_file_types:
         print "ERROR, unknown file type " + file_type + " for " + serializable_name