Merge branch 'master', remote-tracking branch 'upstream/master'
CHEF-3193: LOCK_TIMEOUT in yum-dump.py should be configurable

Allow yum lock timeout from Chef Config yum_timeout.

Issue: CHEF-3193
Merge pull request #1436 from kramvan1/CHEF-3193

CHEF-3193: LOCK_TIMEOUT in yum-dump.py should be configurable