Merge proposals dependent on lp://qastaging/~osomon/moovida/upicek_country_configuration_backend

lp://qastaging/~osomon/moovida/upicek_country_configuration_backend has no merge proposals.