I think the changes to kernel-subpackage-spec are superfluous because the changes to kernel-subpackage-build already detect usrmerge. I did not get to building a TW kernel with this change reverted, though.