Cherry-picked changes from pull request #1392.#1821

martenson merged 3 commits intogalaxyproject:devgalaxyproject/galaxy:devfrom

davebx:toolshed_decouple_apidavebx/galaxy:toolshed_decouple_apiCopy head branch name to clipboard