Issue #3265483 by quietone, danflanagan8, daffie: Handle block migration for modules moved to contrib (cherry picked from commit 9a877cfb)