master
Adjust to Catalog moving to FWStorage
Fix SciTag values
Move files from FWCore/Catalog to FWStorage/Catalog