jenkins_integration: merging cookbook_changes and sync_changes, minor bug fixes