'make check' failures due to recent cl-generic.el etc. changes

[Paul Eggert]

This change:

commit aa1c4ae271733cf7dc64918b570bab4034488fa1 NG
Author: Stefan Monnier <address@hidden>
Date:   Thu Oct 29 10:33:36 2015 -0400

    * lisp/emacs-lisp/cl-generic.el: Accomodate future changes
    ....


causes 'make check' to give me output like this:

Test eieio-test-cl-generic-1 backtrace:
  #[nil "\306\307\310\307\311\312#\313#\210\314\307\312\315\312\316%\2
  ert--run-test-internal([cl-struct-ert--test-execution-info [cl-struc
  ert-run-test([cl-struct-ert-test eieio-test-cl-generic-1 nil #[nil "
  ert-run-or-rerun-test([cl-struct-ert--stats t [[cl-struct-ert-test e
  ert-run-tests(t #[385 "\306^B\307\"address@hidden@address@hidden
  ert-run-tests-batch(nil)
  ert-run-tests-batch-and-exit()
  command-line-1(("-L" ":." "-l" "ert" "-l" "eieio-test-methodinvoke.e
  command-line()
  normal-top-level()
Test eieio-test-cl-generic-1 condition:
    (wrong-number-of-arguments
     (2 . 2)
     1)
   FAILED  1/9  eieio-test-cl-generic-1


with several other failures like that.