Clean up resource upload logic
Clean up resource upload logic

mikemccracken/juju,anastasiamac/juju,frankban/juju,waigani/juju,bac/juju,marcmolla/juju,marcmolla/juju,bac/juju,reedobrien/juju,mikemccracken/juju,anastasiamac/juju,bac/juju,mjs/juju,frankban/juju,AdamIsrael/juju,mjs/juju,mikemccracken/juju,mjs/juju,waigani/juju,marcmolla/juju,anastasiamac/juju,mjs/juju,mjs/juju,ericsnowcurrently/juju,reedobrien/juju,frankban/juju,AdamIsrael/juju,frankban/juju,alesstimec/juju,alesstimec/juju,waigani/juju,mjs/juju,bac/juju,mikemccracken/juju,ericsnowcurrently/juju,waigani/juju,alesstimec/juju,ericsnowcurrently/juju,alesstimec/juju,mjs/juju,AdamIsrael/juju,anastasiamac/juju,reedobrien/juju,reedobrien/juju,marcmolla/juju,alesstimec/juju,ericsnowcurrently/juju,marcmolla/juju,ericsnowcurrently/juju,mikemccracken/juju,frankban/juju,AdamIsrael/juju,reedobrien/juju,anastasiamac/juju,bac/juju