Updates to repair issue 8

https://github.com/Esri/solutions-geoprocessing-toolbox/issues/8