Merge pull request #12579 from cvrebert/patch-1

fix typo in modules.lxc._rand_cpu_str()
Merge pull request #12570 from bretep/eip-option-salt-cloud-rebased

Option to allocate & add elasitc IP to new instance
Merge pull request #12574 from makinacorpus/tfix2

Proper fix for modules lazyloader
Merge pull request #12565 from rallytime/grain_states

Added remaining grains module functions to grains states
Make ec2 create() more reactor friendly
Don't fire opts in the event
Compress man pages
Add /opt/share/man to MANPATH
Properly populate the deploy script
Added ignore_types option to pkg.verify which can be used to omit files of a given type such as config or doc from the returned dict
Fix eauth default value in Batch and cmd_batch
win_dns_client: fix get_dns_servers function, find the nic based on its name and not the driver
adding interfaces_names function to win_network module
use system locale for ports installation
tomcat module: adding temp_war_location argument to war_deployed
Use __opts__ not self.opts
added a describe_volumes function
Follow up for 8ed7c92e798a4bb41efd007e42957a852df0160a

Raise http exceptions in case of BadRequest

Follow `requests` api in error handling.
Merge pull request #12597 from ticosax/salt-cloud-urllib2-requests-errors

Follow up for 8ed7c92e798a4bb41efd007e42957a852df0160a
Merge pull request #12583 from techhat/develop

Make ec2 create() more reactor friendly