1.0.20170810192106: Merge pull request #516 from common-workflow-language/toil-fixes

Refactor secondaryFile handling to avoid basing on primary "location".