Merge branch 'develop' into feature/hlay_lynnt_gdml_v02_06

Author: nathanielerowe

test/fcl/SkipTesting.txt

@@ -3,6 +3,11 @@
 # with the exception of the ones listed in this file.
 #
 
+# Skip for BNB Flux see discussion on PR#854
+set_flux_rhc.fcl
+set_flux_fhc_g4bnb.fcl
+set_flux_beamdump.fcl
+
 # GENIE Configuration fhicls
 set_flux_config_b.fcl
 set_flux_config_c.fcl

ups/product_deps

@@ -255,7 +255,7 @@ wpdir   product_dir     wire-cell-cfg
 product		version		qual	flags		<table_format=2>
 sbncode		v10_12_02       -
 cetmodules	v3_24_01	-	only_for_build
-sbnd_data	v01_36_00	-	
+sbnd_data	v01_37_00	-	
 sbndutil        v10_06_01    -       optional
 fhiclpy		v4_03_05    -
 end_product_list