Adding preserve option to salt.states.file.copy to be able to preserve ownership and mode
Merge remote-tracking branch 'upstream/2014.7' into 2014.7_sam4
Merge pull request #16177 from SmithSamuelM/2014.7_sam4

Clean up RAETChannel changes to support different usages
RST formatting fixes
Fixing lint violation
Merge pull request #16199 from terminalmage/docs

RST formatting fixes
Pylint fix for 2014.7 branch
Merge pull request #16214 from rallytime/pylint

Pylint fix for 2014.7 branch
Added debug statement
Merge remote-tracking branch 'upstream/2014.7' into 2014.7_sam4
If the minion keypair does not exist, generate it

Catches a bug where salt-call doe snot gen the key
First fix for #16106
Fixed issue where get_returns_no_block was excepting if raw was None
Fixed issue where RAETEvent.get_event_noblock was not looking at
enclosed event in msg
Removed debug stuff
Merge pull request #16228 from SmithSamuelM/2014.7_sam5

Fixed issue where new timing for cli broke raetevent
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 #16187 from nmadhok/file-copy-state-preserve

Adding preserve option to salt.states.file.copy to be able to preserve ownership and mode