Jenkins 14833

Hi Josh

I believe this addresses JENKINS-14833 and that the patch is now based on the current code.