Heavy linting of docker module and re-do docker tests.
Fixing lint errors.

Re-introduced some kwargs and args there were here originally.
These will require some additional refactoring to fully remove.
Remove dup name
Merge pull request #12789 from cachedout/7963

Docker module lint and test