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
module.lxc: support for complex network scenariis.

This allow to set additional network nics where the gateway can be setup on.
This allow for exemple eth0 to be on an hostonly network while eth1
is wired to the physical host throught another bridge and eth1 is holding
a publicly addressable IP.

cc @mgw @thatch45 @s0undt3ch @regilero @squizou @jpcw @samaradona
Merge branch 'lxc' into develop