Fastjet contrib interface changes

take changes from jet met PR (but only those needed for compilation/running)