Cherry-picking "8029446: assert(_cfg.get_block_for_node(proj) == borig) failed: incorrect block for kill projections" by adlertz
Cherry-picking "8029446: assert(_cfg.get_block_for_node(proj) == borig) failed: incorrect block for kill projections" by adlertz

wdv4758h/ZipPy,wdv4758h/ZipPy,wdv4758h/ZipPy,wdv4758h/ZipPy,wdv4758h/ZipPy,wdv4758h/ZipPy,wdv4758h/ZipPy,wdv4758h/ZipPy