Fix for JENKINS-14833

I believe this patch fixes JENKINS-14833 by passing the extra command line arguments through the environment expander before adding them to the command line.