Merge branch '8.x' of git.drupal.org:project/drupal into 8.x

core/includes/common.inc

core/modules/entity/lib/Drupal/entity/EntityFieldQuery.php

core/modules/file/file.js

core/modules/forum/forum.module

core/modules/simpletest/config/simpletest.settings.yml

core/modules/simpletest/lib/Drupal/simpletest/TestBase.php

...simpletest/lib/Drupal/simpletest/Tests/SimpleTestTest.php

.../modules/simpletest/lib/Drupal/simpletest/WebTestBase.php

core/modules/simpletest/simpletest.install

core/modules/simpletest/simpletest.module

core/modules/simpletest/simpletest.pages.inc

...es/system/lib/Drupal/system/Tests/Theme/FunctionsTest.php

...les/taxonomy/lib/Drupal/taxonomy/Tests/VocabularyTest.php

core/modules/taxonomy/taxonomy.module