Merge proposals dependent on lp://staging/~nskaggs/juju-release-tools/fix-godeps-removal

lp://staging/~nskaggs/juju-release-tools/fix-godeps-removal has no merge proposals.