Fix BC issue discovered in #1696.

Def.derive has a new parameter, so we add an override which delegates down to the new method.
Merge pull request #1698 from sbt/wip/bc-regression

Fix BC issue discovered in #1696.