Updated default btag discriminators for PAT jet

This is a follow-up to PR #5446 which adds new btag discriminators to the default PAT jet configuration.

Note that this PR requires 720pre7 RelVal samples for PAT tests not to fail.