Issue #3265483 by quietone, danflanagan8, daffie: Handle block migration for modules moved to contrib
mentioned in commit a1923a90