Replaced imp.load_source in messages.base with importlib.import_module.  Made other appropriate changes to 2 data files.