Detect a Drupal 8 site without composer.json for issue #1975220

Committed per original suggestion, using core/core.services.yml to detect Drupal 8.  Also made logic simplification suggested by weitzman.