Merge branch 'hotfix/4398'

Close #4398
Fix BC break in resetParameters signature

- Even though the signature was technically still BC compatible, any extension
  that did not define the second optional parameter would raise a fatal error.

- Solution was to remove the argument, and check for it with
  func_num_args/func_get_arg.
Merge branch 'pr4411' into develop
Forward port #4411