Merge branch '2014.7_sam4' of https://github.com/SmithSamuelM/salt into SmithSamuelM-2014.7_sam4
Lint 1
lint 2
If the minion keypair does not exist, generate it

Catches a bug where salt-call doe snot gen the key
First fix for #16106
avoid creating unparseable lxc config param: lxc.network.mac
lxc module: don't reinvent the wheel -- use lxc-attach built-in args for env and use pipes.quote instead of manual quoting
Add unity manpage to buildpackage spec

This fixes automated package builds in jenkins
Merge pull request #16232 from terminalmage/unity-manpage

Add unity manpage to buildpackage spec
Merge pull request #16226 from thatch45/2014.7

First fix for #16106
Merge pull request #16224 from thatch45/keygen_fallback

If the minion keypair does not exist, generate it
Merge pull request #16231 from rallytime/bp-16144

Backport #16144 to 2014.7
Merge pull request #16193 from thatch45/SmithSamuelM-2014.7_sam4

Merge #16177
Merge remote-tracking branch 'upstream/2014.7' into 2014.7_sam5