Fixed JENKINS-20861

Add CloneOption if appropriate