bcache: update bch_bkey_try_merge

Added generic header checks to bch_bkey_try_merge,
which then calls the bkey specific function

Removed extraneous checks from bch_extent_merge

Signed-off-by: Nicholas Swenson <nks@daterainc.com>

diff --cc drivers/md/bcache/bset.c
Simple merge

diff --cc drivers/md/bcache/bset.h
Simple merge

diff --cc drivers/md/bcache/extents.c
Simple merge