STS-3175 Feature implementation pushed to nightly. Also fixed bug where
variables with spaces in command options are not properly parsed. Also
renamed API.