Merge pull request #13301 from hulu/docker-shadowing

modules.dockerio: avoid shadowing of logs() func
Fixes to module yumpkg.py and state pkg.py to prevent exceptions when yum-plugin-versionlock is not installed and packages are attempted to be held.
Merge pull request #13304 from garethgreenaway/13293

Fixes to module yumpkg.py and state pkg.py
Catch invalid proc files

Also some cleanup and linting.

Closes #12289
Add rpm verify option to pkg.installed state
Update 'doc/.tx/config' - Build #75

  http://cookingwithsalt.org/job/salt/job/transifex/75/

Signed-off-by: Pedro Algarvio <pedro@algarvio.me>
Merge pull request #13307 from cachedout/12289

Catch invalid proc files
Merge pull request #13308 from s0undt3ch/hotfix/transifex-updates

Update 'doc/.tx/config' - Build #75
salt.output.nested: format dicts better, continued
Fixing broken links and updating them to ones that work
Add rpm verify option to pkg.installed state
Bring in event processor
unify return types
Merge pull request #13270 from khrisrichardson/etcd_mods

optionally get etcd vals from master, squash stack traces, and fix lint ...
Merge pull request #13310 from s0undt3ch/hotfix/links

Fixing broken links and updating them to ones that work
Add rpm verify option to pkg.installed state
Add rpm verify option to pkg.installed state
Provide a way to specify which minion version is bootstrapped

NOTE: This does not change which version is tested
Merge pull request #13314 from s0undt3ch/develop

Provide a way to specify which minion version is bootstrapped
Remove unnecessary comma