4.1.5 block migration flag

Make block_migration_flag configurable.

Untested as we don't have a 4.1.5rc test env.