bug fixes for a fresh build on centos
Merge branch 'centos_fixes' of github.com:kirtfitzpatrick/pipeline into kirtfitzpatrick-centos_fixes

Conflicts:
	recipes/jenkins.rb
Merge branch 'kirtfitzpatrick-centos_fixes' into jenkins_cookbook_update