#1039: Redo previous commit per original PR by typhonius, with logic simplification suggested by weitzman. We now recognize Drupal 8 via core/core.services.yml.