salt.modules.lxc: actually use custom nic_opts
Merge branch 'develop' into lxc
Let os.path.join do it's job.

Remove forward slash so that the path will be built
correctly.
fix bad commit and add extra debug logs
Merge pull request #11552 from bretep/fix-ssh-id-wrapper-path

Let os.path.join do it's job.
Honor lack of user/group recurse in file.directory
Add proxy argument to virtualenv state which is passed to pip install
Merge pull request #11580 from msciciel/develop

Add proxy argument to virtualenv state which is passed to pip install
Merge pull request #11570 from steverweber/ineedsleep

fix bad commit and add extra debug logs
Merge pull request #11579 from ze42/fix-file.directory-recurse

Honor lack of user/group recurse in file.directory
Merge pull request #11553 from mgwilliams/lxc

salt.modules.lxc: actually use custom nic_opts