Merge branch '1.1.x' into prod/1.1.x

uw_sites_all.install

@@ -1681,3 +1681,10 @@ function uw_sites_all_update_9141(&$sandbox) {
 
   \Drupal::service('module_installer')->install($modules);
 }
+
+/**
+ * Uninstall contib module conditional fields.
+ */
+function uw_sites_all_update_9142(&$sandbox) {
+  \Drupal::service('module_installer')->uninstall(['conditional_fields']);
+}