Merge pull request #1 from kckane/master

Adding synchronization fix to build master
Merge pull request #2 from jenkinsci/master

Merge pull request #2 from kckane/master