Merge "Added utils for migrating blocking zone configs to DDC" into tm-qpr-dev