Merge branch '8.x-3.x' into 8.x-4.x

modules/salesforce_mapping/src/Form/SalesforceMappingFormCrudBase.php

@@ -134,7 +134,7 @@ abstract class SalesforceMappingFormCrudBase extends SalesforceMappingFormBase {
       '#type' => 'select',
       '#description' => $this->t('Select a Salesforce object to map.'),
       '#default_value' => $salesforce_object_type,
-      '#options' => $object_type_options,
+      '#options' => $this->getSalesforceObjectTypeOptions(),
       '#required' => TRUE,
       '#empty_option' => $this->t('- Select -'),
     ];