Remote _add in the make_*_dict names. Cleanup the import-enclosure script to allow the user to optionaly specify a fw baseline and the licensing intent.