Miscellaneous issues introduced with recent merges.
Issues addressed:
Pylint tests failing because docker modules have the same name as existing module classes. Issue does not effect runtime, only pylint resolving of entire project. Rename docker modules to prevent duplication and correct resolving during pylint test of repository.
Miscellaneous issues introduced with recent merges.
Issues addressed: