Bug 1060295: Make setup reentrant for cp operations
Merge pull request #4639 from ironcladlou/stg/bz/1060295

Merged by openshift-bot