composer/composer pull request changes

Updated a final bug found in the Perforce-Composer source, made changes for pull request.