Issue #1839924 by greg.1.anderson: Update previous fix to work on D8 again (check for package Core before other tests)