DRYed up update_rule logic between TranslatedConditionalAlertUploader and UntranslatedConditionalAlertUploader
DRYed up update_rule logic between TranslatedConditionalAlertUploader and UntranslatedConditionalAlertUploader

Also renamed a few functions

dimagi/commcare-hq,dimagi/commcare-hq,dimagi/commcare-hq,dimagi/commcare-hq,dimagi/commcare-hq