Merge "Add variables block_migration_for_live_migration, block_migrate_cinder_iscsi"