Branch blocker: DrupalTestBase::randomMachineName() change: https://www.drupal.org/node/2315865 Also some tweaks to field_example.