Refactored local charm upload helpers to support multiple service upgrades