Merge changes from topic "export-vcn-flag" into main

* changes:
  Change VCN flag container to tethering
  Clean up fix_config_garbage_collection