Fixing debian_ip.py per #14530.
Merge pull request #14541 from garethgreenaway/14530_ipv6_only_broken

Fixing debian_ip.py per #14530.
Merge branch '2014.7' of https://github.com/saltstack/salt into develop
Remove try/except blocks for imports that will always exist
Merge pull request #14545 from techhat/pepa

Pepa cleanups
Make color output optional
Attempt at fixin pylint errors
Fixed remaining pylint error
Updated docstring #14484
Merge branch 'develop' of https://github.com/saltstack/salt into upstream
Merge pull request #14548 from mickep76/pepa-make-color-output-optional

Make color output optional
Merge pull request #14549 from scott-w/upstream

Update documentation on rabbitmq_user
Merge branch 'develop' into with-pylint-pragmas