Conflicts:
	gso/annotations/__init__.py
	gso/annotations/base_site.py
	gso/annotations/coordinates.py
	gso/annotations/country_code.py
	gso/annotations/interfaces.py
	gso/annotations/ip_address.py
	gso/annotations/netbox_router.py
	gso/annotations/site_name.py
	gso/annotations/snmp.py
	gso/annotations/tt_number.py
	gso/annotations/unique_field.py
	gso/cli/imports.py
	gso/products/product_blocks/iptrunk.py
	gso/products/product_blocks/lan_switch_interconnect.py
	gso/products/product_blocks/site.py
	gso/services/librenms_client.py
	gso/types/__init__.py
	gso/types/base_site.py
	gso/types/coordinates.py
	gso/types/country_code.py
	gso/types/interfaces.py
	gso/types/netbox_router.py
	gso/types/site_name.py
	gso/types/snmp.py
	gso/types/tt_number.py
	gso/types/unique_field.py
	gso/utils/helpers.py
	gso/utils/types/__init__.py
	gso/utils/types/base_site.py
	gso/utils/types/coordinates.py
	gso/utils/types/country_code.py
	gso/utils/types/interfaces.py
	gso/utils/types/netbox_router.py
	gso/utils/types/site_name.py
	gso/utils/types/snmp.py
	gso/utils/types/tt_number.py
	gso/utils/types/unique_field.py
	gso/workflows/iptrunk/deploy_twamp.py
	gso/workflows/iptrunk/modify_isis_metric.py
	gso/workflows/router/redeploy_base_config.py
	gso/workflows/site/create_imported_site.py
	gso/workflows/site/create_site.py
	gso/workflows/site/modify_site.py
	test/conftest.py
	test/schemas/test_types.py
	test/services/test_librenms_client.py
	test/workflows/iptrunk/test_create_imported_iptrunk.py

* Allow for iptrunk validation workflow to be run on those that are still provisioning
* Update test fixture for router to deduplicate code

vendor is moved back into the router product block