Merge pull request #14367 from thatch45/develop

lint
Adding output quiet option in docker push module func
Fixing pylint violation
fix error introduced in 15c6aa829c
Avoid error in pip uninstall

Closes #14295
Remove unused argument 'eip'

This is code cleanup I should have done when I initially committed the code.
Allow OSX to run tests with change to TMPDIR
Merge pull request #14375 from rallytime/run_osx_tests

Allow OSX to run tests with change to TMPDIR
Merge pull request #14369 from nmadhok/add-quiet-mode-dockerio-push

Adding quiet output option in dockerio push module function
Merge pull request #14372 from khrisrichardson/salt.modules.tls

fix error introduced in 15c6aa829c
Merge pull request #14374 from bretep/patch-6

Remove unused argument 'eip'
Merge branch '2014.7' into develop
Skip lxc tests if no lxc and skip failing vt_test if running osx
Update salt for new remote attributes in Raet
Merge remote-tracking branch 'upstream/2014.7' into sam_2014.7
Merge pull request #14378 from rallytime/test_cleanup

Skip lxc tests if no lxc and skip failing vt_test if running osx
Updated training image
Merge 2014.7 into develop
Merge pull request #14381 from SmithSamuelM/sam_2014.7

Added consistent indexing access to remotes by uid, by name, and by ha
Needs Raet v0.2.05
Merge pull request #14382 from s0undt3ch/develop

Forward merge #14378