Issue #2569703 by phenaproxima, benjy, webchick: When migrating to the same theme with different region names, block will not migrate properly