Issue #1997262 by andypost, nick_schuch, larowlan, tim.plunkett, jibran, chertzog, kim.pepper: Convert custom_block_delete_form() to new form interface.