4.1.2 block migration flag

Enable configuration of block_migration_flag.

We're still running 4.1.2; I didn't do the legwork to ensure it applies cleanly against HEAD on grizzly (clearly).