[Argha] merged latest changes from rapidsms_ureport/master into south_sudan branch