fix various problems with automatic data-plane generation
fix various problems with automatic data-plane generation

dhalperi/batfish,intentionet/batfish,intentionet/batfish,intentionet/batfish,dhalperi/batfish,batfish/batfish,arifogel/batfish,batfish/batfish,dhalperi/batfish,arifogel/batfish,batfish/batfish,intentionet/batfish,arifogel/batfish,intentionet/batfish