Merged refs/pull/6503/head from repository cms-sw
follow interface changes in fastjet 3.1 - so pull in content from pending PR
Merge pull request #6506 from davidlange6/fastjet_contrib_interface_changes

Fastjet contrib interface changes