Issue #2199933 by EmanueleQuinto: Followup: BEF Test Content feature conflicts with other feature

tests/bef_test_content/bef_test_content.features.field_base.inc

@@ -121,7 +121,7 @@ function bef_test_content_field_default_field_bases() {
     'settings' => array(
       'allowed_values' => array(
         0 => array(
-          'vocabulary' => 'location',
+          'vocabulary' => 'taxonomy-bef_test-location',
           'parent' => 0,
         ),
       ),

tests/bef_test_content/bef_test_content.features.taxonomy.inc

@@ -9,9 +9,9 @@
  */
 function bef_test_content_taxonomy_default_vocabularies() {
   return array(
-    'location' => array(
+    'taxonomy-bef_test-location' => array(
       'name' => 'Location',
-      'machine_name' => 'location',
+      'machine_name' => 'taxonomy-bef_test-location',
       'description' => '',
       'hierarchy' => 1,
       'module' => 'taxonomy',

tests/bef_test_content/bef_test_content.info

@@ -28,7 +28,7 @@ features[field_instance][] = node-bef_test-field_bef_test_location
 features[field_instance][] = node-bef_test-field_bef_test_numbers
 features[field_instance][] = node-bef_test-field_bef_test_price
 features[node][] = bef_test
-features[taxonomy][] = location
+features[taxonomy][] = taxonomy-bef_test-location
 features[views_view][] = bef_test_view
 features_exclude[dependencies][ctools] = ctools
 features_exclude[dependencies][options] = options

tests/bef_test_content/bef_test_content.views_default.inc

@@ -253,7 +253,7 @@ function bef_test_content_views_default_views() {
     3 => 0,
   );
   $handler->display->display_options['filters']['field_bef_test_location_tid']['type'] = 'select';
-  $handler->display->display_options['filters']['field_bef_test_location_tid']['vocabulary'] = 'location';
+  $handler->display->display_options['filters']['field_bef_test_location_tid']['vocabulary'] = 'taxonomy-bef_test-location';
   $handler->display->display_options['filters']['field_bef_test_location_tid']['hierarchy'] = 1;
 
   /* Display: Page */

tests/better_exposed_filters.test

@@ -316,7 +316,7 @@ class BEF_TestTaxonomyFilters extends BEF_TestBase {
 
     // Add three terms with two children each to the vocab defined in
     // bef_test_content.
-    $vocab = taxonomy_vocabulary_machine_name_load('location');
+    $vocab = taxonomy_vocabulary_machine_name_load('taxonomy-bef_test-location');
     $parents = array();
     foreach (array('parent1', 'parent2', 'parent3') as $name) {
       $term = new stdClass();