268 files changed, 255 insertions, 315 deletions

diff --git a/MAINTAINERS b/MAINTAINERS
index ddde0d1e34a..23a6abf9e21 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -628,12 +628,6 @@ M:	Ole Troan <ot@cisco.com>
 F:	src/vpp/stats/
 F:	src/vpp-api/client/stat_client.[ch]
 
-VPP Object Model
-I:	vom
-M:	Neale Ranns <nranns@cisco.com>
-M:	Mohsin Kazmi <sykazmi@cisco.com>
-F:	extras/vom/vom/
-
 Plugin - Host Stack Applications
 I:	hsa
 M:	Florin Coras <fcoras@cisco.com>
diff --git a/Makefile b/Makefile
index 268c87f3235..44cddc13cad 100644
--- a/Makefile
+++ b/Makefile
@@ -191,8 +191,6 @@ help:
 	@echo " pkg-deb-debug        - build DEB debug packages"
 	@echo " pkg-snap             - build SNAP package"
 	@echo " snap-clean           - clean up snap build environment"
-	@echo " vom-pkg-deb          - build vom DEB packages"
-	@echo " vom-pkg-deb-debug    - build vom DEB debug packages"
 	@echo " pkg-rpm              - build RPM packages"
 	@echo " install-ext-dep[s]   - install external development dependencies"
 	@echo " ctags                - (re)generate ctags database"
@@ -407,13 +405,11 @@ test-gcov:
 
 .PHONY: test-all
 test-all:
-	$(if $(filter-out $(3),retest),make -C $(BR) PLATFORM=vpp TAG=vpp vom-install,)
 	$(eval EXTENDED_TESTS=yes)
 	$(call test,vpp,vpp,test)
 
 .PHONY: test-all-debug
 test-all-debug:
-	$(if $(filter-out $(3),retest),make -C $(BR) PLATFORM=vpp TAG=vpp_debug vom-install,)
 	$(eval EXTENDED_TESTS=yes)
 	$(call test,vpp,vpp_debug,test)
 
@@ -459,7 +455,6 @@ test-wipe-doc:
 
 .PHONY: test-cov
 test-cov:
-	@make -C $(BR) PLATFORM=vpp TAG=vpp_gcov vom-install
 	$(eval EXTENDED_TESTS=yes)
 	$(call test,vpp,vpp_gcov,cov)
 
@@ -564,18 +559,10 @@ snap-clean:
         snapcraft clean ;			\
 	rm -f *.snap *.tgz
 
-.PHONY: vom-pkg-deb
-vom-pkg-deb: pkg-deb
-	$(call make,$(PLATFORM),vom-package-deb)
-
 .PHONY: pkg-deb-debug
 pkg-deb-debug:
 	$(call make,$(PLATFORM)_debug,vpp-package-deb)
 
-.PHONY: vom-pkg-deb-debug
-vom-pkg-deb-debug: pkg-deb-debug
-	$(call make,$(PLATFORM)_debug,vom-package-deb)
-
 .PHONY: pkg-rpm
 pkg-rpm: dist
 	make -C extras/rpm
@@ -712,14 +699,8 @@ pkg-verify: install-dep $(BR)/.deps.ok install-ext-deps
 	@make -C build-root PLATFORM=vpp TAG=vpp sample-plugin-install
 	$(call banner,"Building libmemif")
 	@make -C build-root PLATFORM=vpp TAG=vpp libmemif-install
-	$(call banner,"Building VOM")
-	@make -C build-root PLATFORM=vpp TAG=vpp vom-install
 	$(call banner,"Building $(PKG) packages")
 	@make pkg-$(PKG)
-ifeq ($(OS_ID),ubuntu)
-	$(call banner,"Building VOM $(PKG) package")
-	@make vom-pkg-deb
-endif
 
 MAKE_VERIFY_GATE_OS ?= ubuntu-18.04
 .PHONY: verify
diff --git a/build-data/platforms/vpp.mk b/build-data/platforms/vpp.mk
index f71427c1ae6..83d0fe5840b 100644
--- a/build-data/platforms/vpp.mk
+++ b/build-data/platforms/vpp.mk
@@ -20,7 +20,7 @@ ifeq ($(TARGET_PLATFORM),thunderx)
 vpp_dpdk_target = arm64-thunderx-linuxapp-gcc
 endif
 
-vpp_root_packages = vpp vom
+vpp_root_packages = vpp
 
 vpp_debug_TAG_BUILD_TYPE = debug
 vpp_TAG_BUILD_TYPE = release
diff --git a/docs/gettingstarted/developers/buildsystem/buildrootmakefile.rst b/docs/gettingstarted/developers/buildsystem/buildrootmakefile.rst
index 6963aecb9f3..0adc7f9d033 100644
--- a/docs/gettingstarted/developers/buildsystem/buildrootmakefile.rst
+++ b/docs/gettingstarted/developers/buildsystem/buildrootmakefile.rst
@@ -159,7 +159,7 @@ Here are the contents of .../build-data/platforms/vpp.mk:
         # Uncomment to enable building unit tests
         # vpp_enable_tests = yes
      
-        vpp_root_packages = vpp vom
+        vpp_root_packages = vpp
      
         # DPDK configuration parameters
         # vpp_uses_dpdk_mlx4_pmd = yes
diff --git a/extras/vom/CMakeLists.txt b/extras/deprecated/vom/CMakeLists.txt
index 4947235717e..4947235717e 100644
--- a/extras/vom/CMakeLists.txt
+++ b/extras/deprecated/vom/CMakeLists.txt
diff --git a/extras/vom/cmake/CMakeLists.txt b/extras/deprecated/vom/cmake/CMakeLists.txt
index dff24a99180..dff24a99180 100644
--- a/extras/vom/cmake/CMakeLists.txt
+++ b/extras/deprecated/vom/cmake/CMakeLists.txt
diff --git a/extras/vom/cmake/FindCheck.cmake b/extras/deprecated/vom/cmake/FindCheck.cmake
index e5f399c5449..e5f399c5449 100644
--- a/extras/vom/cmake/FindCheck.cmake
+++ b/extras/deprecated/vom/cmake/FindCheck.cmake
diff --git a/extras/vom/cmake/FindSubunit.cmake b/extras/deprecated/vom/cmake/FindSubunit.cmake
index 121cb5f10e2..121cb5f10e2 100644
--- a/extras/vom/cmake/FindSubunit.cmake
+++ b/extras/deprecated/vom/cmake/FindSubunit.cmake
diff --git a/extras/vom/cmake/VOMConfig.cmake b/extras/deprecated/vom/cmake/VOMConfig.cmake
index a2ea6b60491..a2ea6b60491 100644
--- a/extras/vom/cmake/VOMConfig.cmake
+++ b/extras/deprecated/vom/cmake/VOMConfig.cmake
diff --git a/test/test_vom.py b/extras/deprecated/vom/test/test_vom.py
index 7dea7697f8c..7dea7697f8c 100644
--- a/test/test_vom.py
+++ b/extras/deprecated/vom/test/test_vom.py
diff --git a/test/ext/vom_test.cpp b/extras/deprecated/vom/test/vom_test.cpp
index fa9ecdafe80..fa9ecdafe80 100644
--- a/test/ext/vom_test.cpp
+++ b/extras/deprecated/vom/test/vom_test.cpp
diff --git a/build-data/packages/vom.mk b/extras/deprecated/vom/vom.mk
index f284473beb5..f284473beb5 100644
--- a/build-data/packages/vom.mk
+++ b/extras/deprecated/vom/vom.mk
diff --git a/extras/vom/vom/.clang-format b/extras/deprecated/vom/vom/.clang-format
index b83102010d0..b83102010d0 100644
--- a/extras/vom/vom/.clang-format
+++ b/extras/deprecated/vom/vom/.clang-format
diff --git a/extras/vom/vom/CMakeLists.txt b/extras/deprecated/vom/vom/CMakeLists.txt
index 92a4348dba4..92a4348dba4 100644
--- a/extras/vom/vom/CMakeLists.txt
+++ b/extras/deprecated/vom/vom/CMakeLists.txt
diff --git a/extras/vom/vom/acl_binding.cpp b/extras/deprecated/vom/vom/acl_binding.cpp
index d57ed7741e5..5cdbf89abd6 100644
--- a/extras/vom/vom/acl_binding.cpp
+++ b/extras/deprecated/vom/vom/acl_binding.cpp
@@ -208,7 +208,7 @@ operator<<(std::ostream& os,
 };
 
 /*
- * fd.io coding-style-patch-verification: ON
+ * fd.io coding-style-patch-verification: OFF
  *
  * Local Variables:
  * eval: (c-set-style "mozilla")
diff --git a/extras/vom/vom/acl_binding.hpp b/extras/deprecated/vom/vom/acl_binding.hpp
index 2c9923b8266..e2130fb3389 100644
--- a/extras/vom/vom/acl_binding.hpp
+++ b/extras/deprecated/vom/vom/acl_binding.hpp
@@ -235,7 +235,7 @@ std::ostream& operator<<(std::ostream& os,
 };
 
 /*
- * fd.io coding-style-patch-verification: ON
+ * fd.io coding-style-patch-verification: OFF
  *
  * Local Variables:
  * eval: (c-set-style "mozilla")
diff --git a/extras/vom/vom/acl_binding_cmds.cpp b/extras/deprecated/vom/vom/acl_binding_cmds.cpp
index 062c1b90c9f..57a6e420ca8 100644
--- a/extras/vom/vom/acl_binding_cmds.cpp
+++ b/extras/deprecated/vom/vom/acl_binding_cmds.cpp
@@ -181,7 +181,7 @@ l2_dump_cmd::to_string() const
 }; // namespace VOM
 
 /*
- * fd.io coding-style-patch-verification: ON
+ * fd.io coding-style-patch-verification: OFF
  *
  * Local Variables:
  * eval: (c-set-style "mozilla")
diff --git a/extras/vom/vom/acl_binding_cmds.hpp b/extras/deprecated/vom/vom/acl_binding_cmds.hpp
index 8515b4148ac..0e301df6100 100644
--- a/extras/vom/vom/acl_binding_cmds.hpp
+++ b/extras/deprecated/vom/vom/acl_binding_cmds.hpp
@@ -185,7 +185,7 @@ typedef dump_cmd<vapi::Macip_acl_interface_list_dump> l2_dump_cmd;
 }; // namespace VOM
 
 /*
- * fd.io coding-style-patch-verification: ON
+ * fd.io coding-style-patch-verification: OFF
  *
  * Local Variables:
  * eval: (c-set-style "mozilla")
diff --git a/extras/vom/vom/acl_ethertype.cpp b/extras/deprecated/vom/vom/acl_ethertype.cpp
index 81ed7a28a7a..a72471ac8dc 100644
--- a/extras/vom/vom/acl_ethertype.cpp
+++ b/extras/deprecated/vom/vom/acl_ethertype.cpp
@@ -245,7 +245,7 @@ acl_ethertype::event_handler::show(std::ostream& os)
 };
 };
 /*
- * fd.io coding-style-patch-verification: ON
+ * fd.io coding-style-patch-verification: OFF
  *
  * Local Variables:
  * eval: (c-set-style "mozilla")
diff --git a/extras/vom/vom/acl_ethertype.hpp b/extras/deprecated/vom/vom/acl_ethertype.hpp
index 98d3ce20707..740a2061e77 100644
--- a/extras/vom/vom/acl_ethertype.hpp
+++ b/extras/deprecated/vom/vom/acl_ethertype.hpp
@@ -237,7 +237,7 @@ private:
 };
 
 /*
- * fd.io coding-style-patch-verification: ON
+ * fd.io coding-style-patch-verification: OFF
  *
  * Local Variables:
  * eval: (c-set-style "mozilla")
diff --git a/extras/vom/vom/acl_ethertype_cmds.cpp b/extras/deprecated/vom/vom/acl_ethertype_cmds.cpp
index 0fa1d6db73e..7bad2b7ebdb 100644
--- a/extras/vom/vom/acl_ethertype_cmds.cpp
+++ b/extras/deprecated/vom/vom/acl_ethertype_cmds.cpp
@@ -159,7 +159,7 @@ dump_cmd::to_string() const
 }; // namespace VOM
 
 /*
- * fd.io coding-style-patch-verification: ON
+ * fd.io coding-style-patch-verification: OFF
  *
  * Local Variables:
  * eval: (c-set-style "mozilla")
diff --git a/extras/vom/vom/acl_ethertype_cmds.hpp b/extras/deprecated/vom/vom/acl_ethertype_cmds.hpp
index a294a758056..3ac9d87bc51 100644
--- a/extras/vom/vom/acl_ethertype_cmds.hpp
+++ b/extras/deprecated/vom/vom/acl_ethertype_cmds.hpp
@@ -134,7 +134,7 @@ private:
 };
 };
 /*
- * fd.io coding-style-patch-verification: ON
+ * fd.io coding-style-patch-verification: OFF
  *
  * Local Variables:
  * eval: (c-set-style "mozilla")
diff --git a/extras/vom/vom/acl_l2_list.cpp b/extras/deprecated/vom/vom/acl_l2_list.cpp
index 8684c2c4d3a..fb18ace4b4b 100644
--- a/extras/vom/vom/acl_l2_list.cpp
+++ b/extras/deprecated/vom/vom/acl_l2_list.cpp
@@ -273,7 +273,7 @@ l2_list::replay(void)
 }; // namespace VOM
 
 /*
- * fd.io coding-style-patch-verification: ON
+ * fd.io coding-style-patch-verification: OFF
  *
  * Local Variables:
  * eval: (c-set-style "mozilla")
diff --git a/extras/vom/vom/acl_l2_list.hpp b/extras/deprecated/vom/vom/acl_l2_list.hpp
index 82cfd072fe7..dd7e00a6d4d 100644
--- a/extras/vom/vom/acl_l2_list.hpp
+++ b/extras/deprecated/vom/vom/acl_l2_list.hpp
@@ -214,7 +214,7 @@ private:
 }; // namespace VOM
 
 /*
- * fd.io coding-style-patch-verification: ON
+ * fd.io coding-style-patch-verification: OFF
  *
  * Local Variables:
  * eval: (c-set-style "mozilla")
diff --git a/extras/vom/vom/acl_l2_rule.cpp b/extras/deprecated/vom/vom/acl_l2_rule.cpp
index 2b12e68c184..fdbe62f6f0e 100644
--- a/extras/vom/vom/acl_l2_rule.cpp
+++ b/extras/deprecated/vom/vom/acl_l2_rule.cpp
@@ -91,7 +91,7 @@ l2_rule::mac_mask() const
 }
 }
 /*
- * fd.io coding-style-patch-verification: ON
+ * fd.io coding-style-patch-verification: OFF
  *
  * Local Variables:
  * eval: (c-set-style "mozilla")
diff --git a/extras/vom/vom/acl_l2_rule.hpp b/extras/deprecated/vom/vom/acl_l2_rule.hpp
index 8c094aef5f4..806d8b08867 100644
--- a/extras/vom/vom/acl_l2_rule.hpp
+++ b/extras/deprecated/vom/vom/acl_l2_rule.hpp
@@ -105,7 +105,7 @@ private:
 };
 
 /*
- * fd.io coding-style-patch-verification: ON
+ * fd.io coding-style-patch-verification: OFF
  *
  * Local Variables:
  * eval: (c-set-style "mozilla")
diff --git a/extras/vom/vom/acl_l3_list.cpp b/extras/deprecated/vom/vom/acl_l3_list.cpp
index cfa9cfee948..1afe8cb8863 100644
--- a/extras/vom/vom/acl_l3_list.cpp
+++ b/extras/deprecated/vom/vom/acl_l3_list.cpp
@@ -284,7 +284,7 @@ l3_list::replay(void)
 }; // namespace VOM
 
 /*
- * fd.io coding-style-patch-verification: ON
+ * fd.io coding-style-patch-verification: OFF
  *
  * Local Variables:
  * eval: (c-set-style "mozilla")
diff --git a/extras/vom/vom/acl_l3_list.hpp b/extras/deprecated/vom/vom/acl_l3_list.hpp
index 092bbe37dc0..ecbb19ae6a4 100644
--- a/extras/vom/vom/acl_l3_list.hpp
+++ b/extras/deprecated/vom/vom/acl_l3_list.hpp
@@ -214,7 +214,7 @@ private:
 }; // namespace VOM
 
 /*
- * fd.io coding-style-patch-verification: ON
+ * fd.io coding-style-patch-verification: OFF
  *
  * Local Variables:
  * eval: (c-set-style "mozilla")
diff --git a/extras/vom/vom/acl_l3_rule.cpp b/extras/deprecated/vom/vom/acl_l3_rule.cpp
index 417dc5f2eb7..07e1b3b4940 100644
--- a/extras/vom/vom/acl_l3_rule.cpp
+++ b/extras/deprecated/vom/vom/acl_l3_rule.cpp
@@ -205,7 +205,7 @@ l3_rule::tcp_flags_value() const
 }; // namespace VOM
 
 /*
- * fd.io coding-style-patch-verification: ON
+ * fd.io coding-style-patch-verification: OFF
  *
  * Local Variables:
  * eval: (c-set-style "mozilla")
diff --git a/extras/vom/vom/acl_l3_rule.hpp b/extras/deprecated/vom/vom/acl_l3_rule.hpp
index c1f1ceea5a1..dad38f1918c 100644
--- a/extras/vom/vom/acl_l3_rule.hpp
+++ b/extras/deprecated/vom/vom/acl_l3_rule.hpp
@@ -186,7 +186,7 @@ private:
 };
 
 /*
- * fd.io coding-style-patch-verification: ON
+ * fd.io coding-style-patch-verification: OFF
  *
  * Local Variables:
  * eval: (c-set-style "mozilla")
diff --git a/extras/vom/vom/acl_list_cmds.cpp b/extras/deprecated/vom/vom/acl_list_cmds.cpp
index a589e1f2542..44686a7cf35 100644
--- a/extras/vom/vom/acl_list_cmds.cpp
+++ b/extras/deprecated/vom/vom/acl_list_cmds.cpp
@@ -189,7 +189,7 @@ l2_dump_cmd::issue(connection& con)
 }; // namespace VOM
 
 /*
- * fd.io coding-style-patch-verification: ON
+ * fd.io coding-style-patch-verification: OFF
  *
  * Local Variables:
  * eval: (c-set-style "mozilla")
diff --git a/extras/vom/vom/acl_list_cmds.hpp b/extras/deprecated/vom/vom/acl_list_cmds.hpp
index 252dec7175d..2fc20287e91 100644
--- a/extras/vom/vom/acl_list_cmds.hpp
+++ b/extras/deprecated/vom/vom/acl_list_cmds.hpp
@@ -213,7 +213,7 @@ typedef dump_cmd<vapi::Macip_acl_dump> l2_dump_cmd;
 }; // namespace VOM
 
 /*
- * fd.io coding-style-patch-verification: ON
+ * fd.io coding-style-patch-verification: OFF
  *
  * Local Variables:
  * eval: (c-set-style "mozilla")
diff --git a/extras/vom/vom/acl_types.cpp b/extras/deprecated/vom/vom/acl_types.cpp
index b2c0c7f0b9d..840bf736bd5 100644
--- a/extras/vom/vom/acl_types.cpp
+++ b/extras/deprecated/vom/vom/acl_types.cpp
@@ -51,7 +51,7 @@ action_t::from_bool(bool b, uint8_t c)
 }
 
 /*
- * fd.io coding-style-patch-verification: ON
+ * fd.io coding-style-patch-verification: OFF
  *
  * Local Variables:
  * eval: (c-set-style "mozilla")
diff --git a/extras/vom/vom/acl_types.hpp b/extras/deprecated/vom/vom/acl_types.hpp
index cf5bee3e478..a473818ad55 100644
--- a/extras/vom/vom/acl_types.hpp
+++ b/extras/deprecated/vom/vom/acl_types.hpp
@@ -58,7 +58,7 @@ private:
 };
 
 /*
- * fd.io coding-style-patch-verification: ON
+ * fd.io coding-style-patch-verification: OFF
  *
  * Local Variables:
  * eval: (c-set-style "mozilla")
diff --git a/extras/vom/vom/api_types.cpp b/extras/deprecated/vom/vom/api_types.cpp
index 5eea7654eee..cd66699bb3e 100644
--- a/extras/vom/vom/api_types.cpp
+++ b/extras/deprecated/vom/vom/api_types.cpp
@@ -270,7 +270,7 @@ from_api(vapi_enum_fib_path_nh_proto p)
 }; // VOM
 
 /*
- * fd.io coding-style-patch-verification: ON
+ * fd.io coding-style-patch-verification: OFF
  *
  * Local Variables:
  * eval: (c-set-style "mozilla")
diff --git a/extras/vom/vom/api_types.hpp b/extras/deprecated/vom/vom/api_types.hpp
index 8d898f4c880..dd6f2085810 100644
--- a/extras/vom/vom/api_types.hpp
+++ b/extras/deprecated/vom/vom/api_types.hpp
@@ -67,7 +67,7 @@ const nh_proto_t& from_api(vapi_enum_fib_path_nh_proto);
 }; // VOM
 
 /*
- * fd.io coding-style-patch-verification: ON
+ * fd.io coding-style-patch-verification: OFF
  *
  * Local Variables:
  * eval: (c-set-style "mozilla")
diff --git a/extras/vom/vom/arp_proxy_binding.cpp b/extras/deprecated/vom/vom/arp_proxy_binding.cpp
index bbae9f683eb..8c8ee099b21 100644
--- a/extras/vom/vom/arp_proxy_binding.cpp
+++ b/extras/deprecated/vom/vom/arp_proxy_binding.cpp
@@ -152,7 +152,7 @@ arp_proxy_binding::event_handler::show(std::ostream& os)
 }
 }
 /*
- * fd.io coding-style-patch-verification: ON
+ * fd.io coding-style-patch-verification: OFF
  *
  * Local Variables:
  * eval: (c-set-style "mozilla")
diff --git a/extras/vom/vom/arp_proxy_binding.hpp b/extras/deprecated/vom/vom/arp_proxy_binding.hpp
index 284cf7371fa..b11c5ba4414 100644
--- a/extras/vom/vom/arp_proxy_binding.hpp
+++ b/extras/deprecated/vom/vom/arp_proxy_binding.hpp
@@ -149,7 +149,7 @@ private:
 };
 
 /*
- * fd.io coding-style-patch-verification: ON
+ * fd.io coding-style-patch-verification: OFF
  *
  * Local Variables:
  * eval: (c-set-style "mozilla")
diff --git a/extras/vom/vom/arp_proxy_binding_cmds.cpp b/extras/deprecated/vom/vom/arp_proxy_binding_cmds.cpp
index acad2d5f6ac..eb832fa455e 100644
--- a/extras/vom/vom/arp_proxy_binding_cmds.cpp
+++ b/extras/deprecated/vom/vom/arp_proxy_binding_cmds.cpp
@@ -119,7 +119,7 @@ dump_cmd::to_string() const
 }; // namespace VOM
 
 /*
- * fd.io coding-style-patch-verification: ON
+ * fd.io coding-style-patch-verification: OFF
  *
  * Local Variables:
  * eval: (c-set-style "mozilla")
diff --git a/extras/vom/vom/arp_proxy_binding_cmds.hpp b/extras/deprecated/vom/vom/arp_proxy_binding_cmds.hpp
index 976466b4236..a3139373e61 100644
--- a/extras/vom/vom/arp_proxy_binding_cmds.hpp
+++ b/extras/deprecated/vom/vom/arp_proxy_binding_cmds.hpp
@@ -125,7 +125,7 @@ private:
 }; // namespace VOM
 
 /*
- * fd.io coding-style-patch-verification: ON
+ * fd.io coding-style-patch-verification: OFF
  *
  * Local Variables:
  * eval: (c-set-style "mozilla")
diff --git a/extras/vom/vom/arp_proxy_config.cpp b/extras/deprecated/vom/vom/arp_proxy_config.cpp
index e21fd4a97b2..3d502a2b437 100644
--- a/extras/vom/vom/arp_proxy_config.cpp
+++ b/extras/deprecated/vom/vom/arp_proxy_config.cpp
@@ -155,7 +155,7 @@ operator<<(std::ostream& os, const arp_proxy_config::key_t& key)
 }
 }
 /*
- * fd.io coding-style-patch-verification: ON
+ * fd.io coding-style-patch-verification: OFF
  *
  * Local Variables:
  * eval: (c-set-style "mozilla")
diff --git a/extras/vom/vom/arp_proxy_config.hpp b/extras/deprecated/vom/vom/arp_proxy_config.hpp
index 3a50633de4d..129f7bd7e9e 100644
--- a/extras/vom/vom/arp_proxy_config.hpp
+++ b/extras/deprecated/vom/vom/arp_proxy_config.hpp
@@ -155,7 +155,7 @@ std::ostream& operator<<(std::ostream& os, const arp_proxy_config::key_t& key);
 };
 
 /*
- * fd.io coding-style-patch-verification: ON
+ * fd.io coding-style-patch-verification: OFF
  *
  * Local Variables:
  * eval: (c-set-style "mozilla")
diff --git a/extras/vom/vom/arp_proxy_config_cmds.cpp b/extras/deprecated/vom/vom/arp_proxy_config_cmds.cpp
index a203830a62c..c9eb606e623 100644
--- a/extras/vom/vom/arp_proxy_config_cmds.cpp
+++ b/extras/deprecated/vom/vom/arp_proxy_config_cmds.cpp
@@ -134,7 +134,7 @@ dump_cmd::to_string() const
 }; // namespace VOM
 
 /*
- * fd.io coding-style-patch-verification: ON
+ * fd.io coding-style-patch-verification: OFF
  *
  * Local Variables:
  * eval: (c-set-style "mozilla")
diff --git a/extras/vom/vom/arp_proxy_config_cmds.hpp b/extras/deprecated/vom/vom/arp_proxy_config_cmds.hpp
index ae95251f13e..194acd6eff6 100644
--- a/extras/vom/vom/arp_proxy_config_cmds.hpp
+++ b/extras/deprecated/vom/vom/arp_proxy_config_cmds.hpp
@@ -130,7 +130,7 @@ private:
 }; // namespace VOM
 
 /*
- * fd.io coding-style-patch-verification: ON
+ * fd.io coding-style-patch-verification: OFF
  *
  * Local Variables:
  * eval: (c-set-style "mozilla")
diff --git a/extras/vom/vom/bond_group_binding.cpp b/extras/deprecated/vom/vom/bond_group_binding.cpp
index e5d4f3891b5..f36641b7911 100644
--- a/extras/vom/vom/bond_group_binding.cpp
+++ b/extras/deprecated/vom/vom/bond_group_binding.cpp
@@ -171,7 +171,7 @@ bond_group_binding::event_handler::show(std::ostream& os)
 }
 }
 /*
- * fd.io coding-style-patch-verification: ON
+ * fd.io coding-style-patch-verification: OFF
  *
  * Local Variables:
  * eval: (c-set-style "mozilla")
diff --git a/extras/vom/vom/bond_group_binding.hpp b/extras/deprecated/vom/vom/bond_group_binding.hpp
index bfac4881a44..04befb52939 100644
--- a/extras/vom/vom/bond_group_binding.hpp
+++ b/extras/deprecated/vom/vom/bond_group_binding.hpp
@@ -176,7 +176,7 @@ private:
 };
 
 /*
- * fd.io coding-style-patch-verification: ON
+ * fd.io coding-style-patch-verification: OFF
  *
  * Local Variables:
  * eval: (c-set-style "mozilla")
diff --git a/extras/vom/vom/bond_group_binding_cmds.cpp b/extras/deprecated/vom/vom/bond_group_binding_cmds.cpp
index b257f776373..ffda355358d 100644
--- a/extras/vom/vom/bond_group_binding_cmds.cpp
+++ b/extras/deprecated/vom/vom/bond_group_binding_cmds.cpp
@@ -137,7 +137,7 @@ dump_cmd::to_string() const
 }; // namespace VOM
 
 /*
- * fd.io coding-style-patch-verification: ON
+ * fd.io coding-style-patch-verification: OFF
  *
  * Local Variables:
  * eval: (c-set-style "mozilla")
diff --git a/extras/vom/vom/bond_group_binding_cmds.hpp b/extras/deprecated/vom/vom/bond_group_binding_cmds.hpp
index 3d9bfeedc61..3f511304516 100644
--- a/extras/vom/vom/bond_group_binding_cmds.hpp
+++ b/extras/deprecated/vom/vom/bond_group_binding_cmds.hpp
@@ -128,7 +128,7 @@ private:
 };
 
 /*
- * fd.io coding-style-patch-verification: ON
+ * fd.io coding-style-patch-verification: OFF
  *
  * Local Variables:
  * eval: (c-set-style "mozilla")
diff --git a/extras/vom/vom/bond_interface.cpp b/extras/deprecated/vom/vom/bond_interface.cpp
index 32a00ad7f43..33a001b0209 100644
--- a/extras/vom/vom/bond_interface.cpp
+++ b/extras/deprecated/vom/vom/bond_interface.cpp
@@ -189,7 +189,7 @@ bond_interface::lb_t::lb_t(int v, const std::string& s)
 }; // namespace VOM
 
 /*
- * fd.io coding-style-patch-verification: ON
+ * fd.io coding-style-patch-verification: OFF
  *
  * Local Variables:
  * eval: (c-set-style "mozilla")
diff --git a/extras/vom/vom/bond_interface.hpp b/extras/deprecated/vom/vom/bond_interface.hpp
index 74bc08bbbba..e52b519d6ba 100644
--- a/extras/vom/vom/bond_interface.hpp
+++ b/extras/deprecated/vom/vom/bond_interface.hpp
@@ -187,7 +187,7 @@ private:
 }
 
 /*
- * fd.io coding-style-patch-verification: ON
+ * fd.io coding-style-patch-verification: OFF
  *
  * Local Variables:
  * eval: (c-set-style "mozilla")
diff --git a/extras/vom/vom/bond_interface_cmds.cpp b/extras/deprecated/vom/vom/bond_interface_cmds.cpp
index b5b459a0d42..3e49d2f85e2 100644
--- a/extras/vom/vom/bond_interface_cmds.cpp
+++ b/extras/deprecated/vom/vom/bond_interface_cmds.cpp
@@ -131,7 +131,7 @@ dump_cmd::to_string() const
 } // namespace VOM
 
 /*
- * fd.io coding-style-patch-verification: ON
+ * fd.io coding-style-patch-verification: OFF
  *
  * Local Variables:
  * eval: (c-set-style "mozilla")
diff --git a/extras/vom/vom/bond_interface_cmds.hpp b/extras/deprecated/vom/vom/bond_interface_cmds.hpp
index 06a8ac15009..5b1e0fcc98d 100644
--- a/extras/vom/vom/bond_interface_cmds.hpp
+++ b/extras/deprecated/vom/vom/bond_interface_cmds.hpp
@@ -102,7 +102,7 @@ public:
 }; // namespace VOM
 
 /*
- * fd.io coding-style-patch-verification: ON
+ * fd.io coding-style-patch-verification: OFF
  *
  * Local Variables:
  * eval: (c-set-style "mozilla")
diff --git a/extras/vom/vom/bond_member.cpp b/extras/deprecated/vom/vom/bond_member.cpp
index f1a27b3d1c6..d8edb1b6a20 100644
--- a/extras/vom/vom/bond_member.cpp
+++ b/extras/deprecated/vom/vom/bond_member.cpp
@@ -122,7 +122,7 @@ bond_member::rate_t::rate_t(int v, const std::string& s)
 }; // namespace VOM
 
 /*
- * fd.io coding-style-patch-verification: ON
+ * fd.io coding-style-patch-verification: OFF
  *
  * Local Variables:
  * eval: (c-set-style "mozilla")
diff --git a/extras/vom/vom/bond_member.hpp b/extras/deprecated/vom/vom/bond_member.hpp
index 066933b74d7..0d65d77028c 100644
--- a/extras/vom/vom/bond_member.hpp
+++ b/extras/deprecated/vom/vom/bond_member.hpp
@@ -137,7 +137,7 @@ private:
 }
 
 /*
- * fd.io coding-style-patch-verification: ON
+ * fd.io coding-style-patch-verification: OFF
  *
  * Local Variables:
  * eval: (c-set-style "mozilla")
diff --git a/extras/vom/vom/bridge_domain.cpp b/extras/deprecated/vom/vom/bridge_domain.cpp
index e86fc26b268..b9105e015f4 100644
--- a/extras/vom/vom/bridge_domain.cpp
+++ b/extras/deprecated/vom/vom/bridge_domain.cpp
@@ -300,7 +300,7 @@ bridge_domain::event_handler::show(std::ostream& os)
 }
 
 /*
- * fd.io coding-style-patch-verification: ON
+ * fd.io coding-style-patch-verification: OFF
  *
  * Local Variables:
  * eval: (c-set-style "mozilla")
diff --git a/extras/vom/vom/bridge_domain.hpp b/extras/deprecated/vom/vom/bridge_domain.hpp
index 8ece1cc89d1..633ed15b0d4 100644
--- a/extras/vom/vom/bridge_domain.hpp
+++ b/extras/deprecated/vom/vom/bridge_domain.hpp
@@ -296,7 +296,7 @@ private:
 };
 
 /*
- * fd.io coding-style-patch-verification: ON
+ * fd.io coding-style-patch-verification: OFF
  *
  * Local Variables:
  * eval: (c-set-style "mozilla")
diff --git a/extras/vom/vom/bridge_domain_arp_entry.cpp b/extras/deprecated/vom/vom/bridge_domain_arp_entry.cpp
index f468e0f977f..699d35bfc3c 100644
--- a/extras/vom/vom/bridge_domain_arp_entry.cpp
+++ b/extras/deprecated/vom/vom/bridge_domain_arp_entry.cpp
@@ -212,7 +212,7 @@ operator<<(std::ostream& os, const bridge_domain_arp_entry::key_t& key)
 }
 }
 /*
- * fd.io coding-style-patch-verification: ON
+ * fd.io coding-style-patch-verification: OFF
  *
  * Local Variables:
  * eval: (c-set-style "mozilla")
diff --git a/extras/vom/vom/bridge_domain_arp_entry.hpp b/extras/deprecated/vom/vom/bridge_domain_arp_entry.hpp
index b4af6a0f62e..ac1bcdb5668 100644
--- a/extras/vom/vom/bridge_domain_arp_entry.hpp
+++ b/extras/deprecated/vom/vom/bridge_domain_arp_entry.hpp
@@ -185,7 +185,7 @@ std::ostream& operator<<(std::ostream& os,
 }; // namespace
 
 /*
- * fd.io coding-style-patch-verification: ON
+ * fd.io coding-style-patch-verification: OFF
  *
  * Local Variables:
  * eval: (c-set-style "mozilla")
diff --git a/extras/vom/vom/bridge_domain_arp_entry_cmds.cpp b/extras/deprecated/vom/vom/bridge_domain_arp_entry_cmds.cpp
index e1a80908271..fdfc45b7d9a 100644
--- a/extras/vom/vom/bridge_domain_arp_entry_cmds.cpp
+++ b/extras/deprecated/vom/vom/bridge_domain_arp_entry_cmds.cpp
@@ -153,7 +153,7 @@ dump_cmd::to_string() const
 }; // namespace VOM
 
 /*
- * fd.io coding-style-patch-verification: ON
+ * fd.io coding-style-patch-verification: OFF
  *
  * Local Variables:
  * eval: (c-set-style "mozilla")
diff --git a/extras/vom/vom/bridge_domain_arp_entry_cmds.hpp b/extras/deprecated/vom/vom/bridge_domain_arp_entry_cmds.hpp
index 490fc4ba738..2c7b5e27043 100644
--- a/extras/vom/vom/bridge_domain_arp_entry_cmds.hpp
+++ b/extras/deprecated/vom/vom/bridge_domain_arp_entry_cmds.hpp
@@ -136,7 +136,7 @@ private:
 };
 
 /*
- * fd.io coding-style-patch-verification: ON
+ * fd.io coding-style-patch-verification: OFF
  *
  * Local Variables:
  * eval: (c-set-style "mozilla")
diff --git a/extras/vom/vom/bridge_domain_cmds.cpp b/extras/deprecated/vom/vom/bridge_domain_cmds.cpp
index 1aeafcee44f..00c554205bd 100644
--- a/extras/vom/vom/bridge_domain_cmds.cpp
+++ b/extras/deprecated/vom/vom/bridge_domain_cmds.cpp
@@ -143,7 +143,7 @@ dump_cmd::to_string() const
 }
 
 /*
- * fd.io coding-style-patch-verification: ON
+ * fd.io coding-style-patch-verification: OFF
  *
  * Local Variables:
  * eval: (c-set-style "mozilla")
diff --git a/extras/vom/vom/bridge_domain_cmds.hpp b/extras/deprecated/vom/vom/bridge_domain_cmds.hpp
index 395b3560d7a..2cb3bc8fe7f 100644
--- a/extras/vom/vom/bridge_domain_cmds.hpp
+++ b/extras/deprecated/vom/vom/bridge_domain_cmds.hpp
@@ -146,7 +146,7 @@ private:
 };
 
 /*
- * fd.io coding-style-patch-verification: ON
+ * fd.io coding-style-patch-verification: OFF
  *
  * Local Variables:
  * eval: (c-set-style "mozilla")
diff --git a/extras/vom/vom/bridge_domain_entry.cpp b/extras/deprecated/vom/vom/bridge_domain_entry.cpp
index 241de953771..6c837f5dc9f 100644
--- a/extras/vom/vom/bridge_domain_entry.cpp
+++ b/extras/deprecated/vom/vom/bridge_domain_entry.cpp
@@ -216,7 +216,7 @@ operator<<(std::ostream& os, const bridge_domain_entry::key_t& key)
 }
 
 /*
- * fd.io coding-style-patch-verification: ON
+ * fd.io coding-style-patch-verification: OFF
  *
  * Local Variables:
  * eval: (c-set-style "mozilla")
diff --git a/extras/vom/vom/bridge_domain_entry.hpp b/extras/deprecated/vom/vom/bridge_domain_entry.hpp
index 2aef697ebca..68a3459c824 100644
--- a/extras/vom/vom/bridge_domain_entry.hpp
+++ b/extras/deprecated/vom/vom/bridge_domain_entry.hpp
@@ -182,7 +182,7 @@ std::ostream& operator<<(std::ostream& os,
 };
 
 /*
- * fd.io coding-style-patch-verification: ON
+ * fd.io coding-style-patch-verification: OFF
  *
  * Local Variables:
  * eval: (c-set-style "mozilla")
diff --git a/extras/vom/vom/bridge_domain_entry_cmds.cpp b/extras/deprecated/vom/vom/bridge_domain_entry_cmds.cpp
index ffdd02de0d2..885a5578f12 100644
--- a/extras/vom/vom/bridge_domain_entry_cmds.cpp
+++ b/extras/deprecated/vom/vom/bridge_domain_entry_cmds.cpp
@@ -147,7 +147,7 @@ dump_cmd::to_string() const
 }
 
 /*
- * fd.io coding-style-patch-verification: ON
+ * fd.io coding-style-patch-verification: OFF
  *
  * Local Variables:
  * eval: (c-set-style "mozilla")
diff --git a/extras/vom/vom/bridge_domain_entry_cmds.hpp b/extras/deprecated/vom/vom/bridge_domain_entry_cmds.hpp
index dfee04f2a0d..88bb4e1ec49 100644
--- a/extras/vom/vom/bridge_domain_entry_cmds.hpp
+++ b/extras/deprecated/vom/vom/bridge_domain_entry_cmds.hpp
@@ -133,7 +133,7 @@ private:
 };
 
 /*
- * fd.io coding-style-patch-verification: ON
+ * fd.io coding-style-patch-verification: OFF
  *
  * Local Variables:
  * eval: (c-set-style "mozilla")
diff --git a/extras/vom/vom/client_db.cpp b/extras/deprecated/vom/vom/client_db.cpp
index 41463d1dd74..b7dcd0114a4 100644
--- a/extras/vom/vom/client_db.cpp
+++ b/extras/deprecated/vom/vom/client_db.cpp
@@ -51,7 +51,7 @@ client_db::dump(std::ostream& os)
 }
 
 /*
- * fd.io coding-style-patch-verification: ON
+ * fd.io coding-style-patch-verification: OFF
  *
  * Local Variables:
  * eval: (c-set-style "mozilla")
diff --git a/extras/vom/vom/client_db.hpp b/extras/deprecated/vom/vom/client_db.hpp
index 34204c1d839..553b9420195 100644
--- a/extras/vom/vom/client_db.hpp
+++ b/extras/deprecated/vom/vom/client_db.hpp
@@ -79,7 +79,7 @@ private:
 };
 
 /*
- * fd.io coding-style-patch-verification: ON
+ * fd.io coding-style-patch-verification: OFF
  *
  * Local Variables:
  * eval: (c-set-style "mozilla")
diff --git a/extras/vom/vom/cmd.cpp b/extras/deprecated/vom/vom/cmd.cpp
index 5623507a63f..846854b5807 100644
--- a/extras/vom/vom/cmd.cpp
+++ b/extras/deprecated/vom/vom/cmd.cpp
@@ -29,7 +29,7 @@ operator<<(std::ostream& os, const cmd& cmd)
 }
 
 /*
- * fd.io coding-style-patch-verification: ON
+ * fd.io coding-style-patch-verification: OFF
  *
  * Local Variables:
  * eval: (c-set-style "mozilla")
diff --git a/extras/vom/vom/cmd.hpp b/extras/deprecated/vom/vom/cmd.hpp
index 9c87d31218a..b95de41095e 100644
--- a/extras/vom/vom/cmd.hpp
+++ b/extras/deprecated/vom/vom/cmd.hpp
@@ -70,7 +70,7 @@ std::ostream& operator<<(std::ostream& os, const cmd& cmd);
 };
 
 /*
- * fd.io coding-style-patch-verification: ON
+ * fd.io coding-style-patch-verification: OFF
  *
  * Local Variables:
  * eval: (c-set-style "mozilla")
diff --git a/extras/vom/vom/connection.cpp b/extras/deprecated/vom/vom/connection.cpp
index c03ef99c172..3de44eaa0ce 100644
--- a/extras/vom/vom/connection.cpp
+++ b/extras/deprecated/vom/vom/connection.cpp
@@ -53,7 +53,7 @@ connection::ctx()
 }
 
 /*
- * fd.io coding-style-patch-verification: ON
+ * fd.io coding-style-patch-verification: OFF
  *
  * Local Variables:
  * eval: (c-set-style "mozilla")
diff --git a/extras/vom/vom/connection.hpp b/extras/deprecated/vom/vom/connection.hpp
index 06fe840232d..26b7d184596 100644
--- a/extras/vom/vom/connection.hpp
+++ b/extras/deprecated/vom/vom/connection.hpp
@@ -72,7 +72,7 @@ private:
 };
 
 /*
- * fd.io coding-style-patch-verification: ON
+ * fd.io coding-style-patch-verification: OFF
  *
  * Local Variables:
  * eval: (c-set-style "mozilla")
diff --git a/extras/vom/vom/dhcp_client.cpp b/extras/deprecated/vom/vom/dhcp_client.cpp
index 23911b3df0e..1c1dd819fc0 100644
--- a/extras/vom/vom/dhcp_client.cpp
+++ b/extras/deprecated/vom/vom/dhcp_client.cpp
@@ -347,7 +347,7 @@ dhcp_client::dhcp_client_listener::handle_dhcp_event(std::shared_ptr<lease_t> e)
 }; // namespace VOM
 
 /*
- * fd.io coding-style-patch-verification: ON
+ * fd.io coding-style-patch-verification: OFF
  *
  * Local Variables:
  * eval: (c-set-style "mozilla")
diff --git a/extras/vom/vom/dhcp_client.hpp b/extras/deprecated/vom/vom/dhcp_client.hpp
index 8e8669a96ef..8eccb9ac23f 100644
--- a/extras/vom/vom/dhcp_client.hpp
+++ b/extras/deprecated/vom/vom/dhcp_client.hpp
@@ -307,7 +307,7 @@ private:
 };
 
 /*
- * fd.io coding-style-patch-verification: ON
+ * fd.io coding-style-patch-verification: OFF
  *
  * Local Variables:
  * eval: (c-set-style "mozilla")
diff --git a/extras/vom/vom/dhcp_client_cmds.cpp b/extras/deprecated/vom/vom/dhcp_client_cmds.cpp
index 3f899a63c01..f26ad6ecf1e 100644
--- a/extras/vom/vom/dhcp_client_cmds.cpp
+++ b/extras/deprecated/vom/vom/dhcp_client_cmds.cpp
@@ -234,7 +234,7 @@ dump_cmd::to_string() const
 }; // namespace VOM
 
 /*
- * fd.io coding-style-patch-verification: ON
+ * fd.io coding-style-patch-verification: OFF
  *
  * Local Variables:
  * eval: (c-set-style "mozilla")
diff --git a/extras/vom/vom/dhcp_client_cmds.hpp b/extras/deprecated/vom/vom/dhcp_client_cmds.hpp
index 10d4026f4f3..5ee05fc0e24 100644
--- a/extras/vom/vom/dhcp_client_cmds.hpp
+++ b/extras/deprecated/vom/vom/dhcp_client_cmds.hpp
@@ -203,7 +203,7 @@ private:
 }; // namespace VOM
 
 /*
- * fd.io coding-style-patch-verification: ON
+ * fd.io coding-style-patch-verification: OFF
  *
  * Local Variables:
  * eval: (c-set-style "mozilla")
diff --git a/extras/vom/vom/dump_cmd.hpp b/extras/deprecated/vom/vom/dump_cmd.hpp
index 4dad02b911e..be85a46a7c7 100644
--- a/extras/vom/vom/dump_cmd.hpp
+++ b/extras/deprecated/vom/vom/dump_cmd.hpp
@@ -145,7 +145,7 @@ protected:
 };
 
 /*
- * fd.io coding-style-patch-verification: ON
+ * fd.io coding-style-patch-verification: OFF
  *
  * Local Variables:
  * eval: (c-set-style "mozilla")
diff --git a/extras/vom/vom/enum_base.hpp b/extras/deprecated/vom/vom/enum_base.hpp
index 015410a57c5..2ac8edebfce 100644
--- a/extras/vom/vom/enum_base.hpp
+++ b/extras/deprecated/vom/vom/enum_base.hpp
@@ -116,7 +116,7 @@ private:
 };
 
 /*
- * fd.io coding-style-patch-verification: ON
+ * fd.io coding-style-patch-verification: OFF
  *
  * Local Variables:
  * eval: (c-set-style "mozilla")
diff --git a/extras/vom/vom/event_cmd.hpp b/extras/deprecated/vom/vom/event_cmd.hpp
index 1120f75b399..c7a561355c7 100644
--- a/extras/vom/vom/event_cmd.hpp
+++ b/extras/deprecated/vom/vom/event_cmd.hpp
@@ -107,7 +107,7 @@ protected:
 };
 
 /*
- * fd.io coding-style-patch-verification: ON
+ * fd.io coding-style-patch-verification: OFF
  *
  * Local Variables:
  * eval: (c-set-style "mozilla")
diff --git a/extras/vom/vom/gbp_bridge_domain.cpp b/extras/deprecated/vom/vom/gbp_bridge_domain.cpp
index 3e015c379c2..cc4e256c7aa 100644
--- a/extras/vom/vom/gbp_bridge_domain.cpp
+++ b/extras/deprecated/vom/vom/gbp_bridge_domain.cpp
@@ -347,7 +347,7 @@ gbp_bridge_domain::event_handler::show(std::ostream& os)
 }
 
 /*
- * fd.io coding-style-patch-verification: ON
+ * fd.io coding-style-patch-verification: OFF
  *
  * Local Variables:
  * eval: (c-set-style "mozilla")
diff --git a/extras/vom/vom/gbp_bridge_domain.hpp b/extras/deprecated/vom/vom/gbp_bridge_domain.hpp
index d397fe5231f..c6e5b1285b2 100644
--- a/extras/vom/vom/gbp_bridge_domain.hpp
+++ b/extras/deprecated/vom/vom/gbp_bridge_domain.hpp
@@ -211,7 +211,7 @@ private:
 }; // namespace
 
 /*
- * fd.io coding-style-patch-verification: ON
+ * fd.io coding-style-patch-verification: OFF
  *
  * Local Variables:
  * eval: (c-set-style "mozilla")
diff --git a/extras/vom/vom/gbp_bridge_domain_cmds.cpp b/extras/deprecated/vom/vom/gbp_bridge_domain_cmds.cpp
index 05064df6269..b6124760a1d 100644
--- a/extras/vom/vom/gbp_bridge_domain_cmds.cpp
+++ b/extras/deprecated/vom/vom/gbp_bridge_domain_cmds.cpp
@@ -151,7 +151,7 @@ dump_cmd::to_string() const
 }; // namespace VOM
 
 /*
- * fd.io coding-style-patch-verification: ON
+ * fd.io coding-style-patch-verification: OFF
  *
  * Local Variables:
  * eval: (c-set-style "mozilla")
diff --git a/extras/vom/vom/gbp_bridge_domain_cmds.hpp b/extras/deprecated/vom/vom/gbp_bridge_domain_cmds.hpp
index 6dbe6dcdfed..76fc86d0b91 100644
--- a/extras/vom/vom/gbp_bridge_domain_cmds.hpp
+++ b/extras/deprecated/vom/vom/gbp_bridge_domain_cmds.hpp
@@ -127,7 +127,7 @@ private:
 }; // VOM
 
 /*
- * fd.io coding-style-patch-verification: ON
+ * fd.io coding-style-patch-verification: OFF
  *
  * Local Variables:
  * eval: (c-set-style "mozilla")
diff --git a/extras/vom/vom/gbp_contract.cpp b/extras/deprecated/vom/vom/gbp_contract.cpp
index 8fcef02da24..f1b35ddf8c4 100644
--- a/extras/vom/vom/gbp_contract.cpp
+++ b/extras/deprecated/vom/vom/gbp_contract.cpp
@@ -246,7 +246,7 @@ operator<<(std::ostream& os, const gbp_contract::key_t& key)
 } // namespace VOM
 
 /*
- * fd.io coding-style-patch-verification: ON
+ * fd.io coding-style-patch-verification: OFF
  *
  * Local Variables:
  * eval: (c-set-style "mozilla")
diff --git a/extras/vom/vom/gbp_contract.hpp b/extras/deprecated/vom/vom/gbp_contract.hpp
index caf5a3c5a0e..d935030034e 100644
--- a/extras/vom/vom/gbp_contract.hpp
+++ b/extras/deprecated/vom/vom/gbp_contract.hpp
@@ -207,7 +207,7 @@ std::ostream& operator<<(std::ostream& os, const gbp_contract::key_t& key);
 }; // namespace
 
 /*
- * fd.io coding-style-patch-verification: ON
+ * fd.io coding-style-patch-verification: OFF
  *
  * Local Variables:
  * eval: (c-set-style "mozilla")
diff --git a/extras/vom/vom/gbp_contract_cmds.cpp b/extras/deprecated/vom/vom/gbp_contract_cmds.cpp
index 1bb06bdaa69..63d9334faf0 100644
--- a/extras/vom/vom/gbp_contract_cmds.cpp
+++ b/extras/deprecated/vom/vom/gbp_contract_cmds.cpp
@@ -192,7 +192,7 @@ dump_cmd::to_string() const
 }; // namespace VOM
 
 /*
- * fd.io coding-style-patch-verification: ON
+ * fd.io coding-style-patch-verification: OFF
  *
  * Local Variables:
  * eval: (c-set-style "mozilla")
diff --git a/extras/vom/vom/gbp_contract_cmds.hpp b/extras/deprecated/vom/vom/gbp_contract_cmds.hpp
index d9fe1d74e37..2146d5d732c 100644
--- a/extras/vom/vom/gbp_contract_cmds.hpp
+++ b/extras/deprecated/vom/vom/gbp_contract_cmds.hpp
@@ -137,7 +137,7 @@ private:
 }; // namespace VOM
 
 /*
- * fd.io coding-style-patch-verification: ON
+ * fd.io coding-style-patch-verification: OFF
  *
  * Local Variables:
  * eval: (c-set-style "mozilla")
diff --git a/extras/vom/vom/gbp_endpoint.cpp b/extras/deprecated/vom/vom/gbp_endpoint.cpp
index ef406b16565..fa8907dcc04 100644
--- a/extras/vom/vom/gbp_endpoint.cpp
+++ b/extras/deprecated/vom/vom/gbp_endpoint.cpp
@@ -216,7 +216,7 @@ operator<<(std::ostream& os, const gbp_endpoint::key_t& key)
 } // namespace VOM
 
 /*
- * fd.io coding-style-patch-verification: ON
+ * fd.io coding-style-patch-verification: OFF
  *
  * Local Variables:
  * eval: (c-set-style "mozilla")
diff --git a/extras/vom/vom/gbp_endpoint.hpp b/extras/deprecated/vom/vom/gbp_endpoint.hpp
index 8008e3b1c67..3d92506d4ce 100644
--- a/extras/vom/vom/gbp_endpoint.hpp
+++ b/extras/deprecated/vom/vom/gbp_endpoint.hpp
@@ -208,7 +208,7 @@ std::ostream& operator<<(std::ostream& os, const gbp_endpoint::key_t& key);
 }; // namespace
 
 /*
- * fd.io coding-style-patch-verification: ON
+ * fd.io coding-style-patch-verification: OFF
  *
  * Local Variables:
  * eval: (c-set-style "mozilla")
diff --git a/extras/vom/vom/gbp_endpoint_cmds.cpp b/extras/deprecated/vom/vom/gbp_endpoint_cmds.cpp
index f0c55ebc4da..de7c77b41f6 100644
--- a/extras/vom/vom/gbp_endpoint_cmds.cpp
+++ b/extras/deprecated/vom/vom/gbp_endpoint_cmds.cpp
@@ -184,7 +184,7 @@ dump_cmd::to_string() const
 }; // namespace VOM
 
 /*
- * fd.io coding-style-patch-verification: ON
+ * fd.io coding-style-patch-verification: OFF
  *
  * Local Variables:
  * eval: (c-set-style "mozilla")
diff --git a/extras/vom/vom/gbp_endpoint_cmds.hpp b/extras/deprecated/vom/vom/gbp_endpoint_cmds.hpp
index 4b9036aca00..b0a62acace7 100644
--- a/extras/vom/vom/gbp_endpoint_cmds.hpp
+++ b/extras/deprecated/vom/vom/gbp_endpoint_cmds.hpp
@@ -131,7 +131,7 @@ private:
 }; // namespace VOM
 
 /*
- * fd.io coding-style-patch-verification: ON
+ * fd.io coding-style-patch-verification: OFF
  *
  * Local Variables:
  * eval: (c-set-style "mozilla")
diff --git a/extras/vom/vom/gbp_endpoint_group.cpp b/extras/deprecated/vom/vom/gbp_endpoint_group.cpp
index abec585c744..03f17a7f4fe 100644
--- a/extras/vom/vom/gbp_endpoint_group.cpp
+++ b/extras/deprecated/vom/vom/gbp_endpoint_group.cpp
@@ -283,7 +283,7 @@ gbp_endpoint_group::event_handler::show(std::ostream& os)
 } // namespace VOM
 
 /*
- * fd.io coding-style-patch-verification: ON
+ * fd.io coding-style-patch-verification: OFF
  *
  * Local Variables:
  * eval: (c-set-style "mozilla")
diff --git a/extras/vom/vom/gbp_endpoint_group.hpp b/extras/deprecated/vom/vom/gbp_endpoint_group.hpp
index e15a1885317..ecc4c4f4baf 100644
--- a/extras/vom/vom/gbp_endpoint_group.hpp
+++ b/extras/deprecated/vom/vom/gbp_endpoint_group.hpp
@@ -235,7 +235,7 @@ private:
 }; // namespace
 
 /*
- * fd.io coding-style-patch-verification: ON
+ * fd.io coding-style-patch-verification: OFF
  *
  * Local Variables:
  * eval: (c-set-style "mozilla")
diff --git a/extras/vom/vom/gbp_endpoint_group_cmds.cpp b/extras/deprecated/vom/vom/gbp_endpoint_group_cmds.cpp
index c5618602550..15a8858d5d6 100644
--- a/extras/vom/vom/gbp_endpoint_group_cmds.cpp
+++ b/extras/deprecated/vom/vom/gbp_endpoint_group_cmds.cpp
@@ -139,7 +139,7 @@ dump_cmd::to_string() const
 }; // namespace VOM
 
 /*
- * fd.io coding-style-patch-verification: ON
+ * fd.io coding-style-patch-verification: OFF
  *
  * Local Variables:
  * eval: (c-set-style "mozilla")
diff --git a/extras/vom/vom/gbp_endpoint_group_cmds.hpp b/extras/deprecated/vom/vom/gbp_endpoint_group_cmds.hpp
index fa892726bf3..5e7e0633dfc 100644
--- a/extras/vom/vom/gbp_endpoint_group_cmds.hpp
+++ b/extras/deprecated/vom/vom/gbp_endpoint_group_cmds.hpp
@@ -131,7 +131,7 @@ private:
 }; // namespace VOM
 
 /*
- * fd.io coding-style-patch-verification: ON
+ * fd.io coding-style-patch-verification: OFF
  *
  * Local Variables:
  * eval: (c-set-style "mozilla")
diff --git a/extras/vom/vom/gbp_ext_itf.cpp b/extras/deprecated/vom/vom/gbp_ext_itf.cpp
index 91697352cd5..55a0fbd3d69 100644
--- a/extras/vom/vom/gbp_ext_itf.cpp
+++ b/extras/deprecated/vom/vom/gbp_ext_itf.cpp
@@ -189,7 +189,7 @@ gbp_ext_itf::event_handler::show(std::ostream& os)
 } // namespace VOM
 
 /*
- * fd.io coding-style-patch-verification: ON
+ * fd.io coding-style-patch-verification: OFF
  *
  * Local Variables:
  * eval: (c-set-style "mozilla")
diff --git a/extras/vom/vom/gbp_ext_itf.hpp b/extras/deprecated/vom/vom/gbp_ext_itf.hpp
index 20d9b6eff9b..5de85373a4d 100644
--- a/extras/vom/vom/gbp_ext_itf.hpp
+++ b/extras/deprecated/vom/vom/gbp_ext_itf.hpp
@@ -176,7 +176,7 @@ private:
 }; // namespace VOM
 
 /*
- * fd.io coding-style-patch-verification: ON
+ * fd.io coding-style-patch-verification: OFF
  *
  * Local Variables:
  * eval: (c-set-style "mozilla")
diff --git a/extras/vom/vom/gbp_ext_itf_cmds.cpp b/extras/deprecated/vom/vom/gbp_ext_itf_cmds.cpp
index b2090ea0fa5..cf22aac102e 100644
--- a/extras/vom/vom/gbp_ext_itf_cmds.cpp
+++ b/extras/deprecated/vom/vom/gbp_ext_itf_cmds.cpp
@@ -127,7 +127,7 @@ dump_cmd::to_string() const
 }; // namespace VOM
 
 /*
- * fd.io coding-style-patch-verification: ON
+ * fd.io coding-style-patch-verification: OFF
  *
  * Local Variables:
  * eval: (c-set-style "mozilla")
diff --git a/extras/vom/vom/gbp_ext_itf_cmds.hpp b/extras/deprecated/vom/vom/gbp_ext_itf_cmds.hpp
index 51052b9a360..3d14f05580a 100644
--- a/extras/vom/vom/gbp_ext_itf_cmds.hpp
+++ b/extras/deprecated/vom/vom/gbp_ext_itf_cmds.hpp
@@ -124,7 +124,7 @@ private:
 }; // namespace VOM
 
 /*
- * fd.io coding-style-patch-verification: ON
+ * fd.io coding-style-patch-verification: OFF
  *
  * Local Variables:
  * eval: (c-set-style "mozilla")
diff --git a/extras/vom/vom/gbp_recirc.cpp b/extras/deprecated/vom/vom/gbp_recirc.cpp
index 19cb2da60e2..5b0d368d80d 100644
--- a/extras/vom/vom/gbp_recirc.cpp
+++ b/extras/deprecated/vom/vom/gbp_recirc.cpp
@@ -192,7 +192,7 @@ gbp_recirc::event_handler::show(std::ostream& os)
 } // namespace VOM
 
 /*
- * fd.io coding-style-patch-verification: ON
+ * fd.io coding-style-patch-verification: OFF
  *
  * Local Variables:
  * eval: (c-set-style "mozilla")
diff --git a/extras/vom/vom/gbp_recirc.hpp b/extras/deprecated/vom/vom/gbp_recirc.hpp
index fee4f6c2502..7cc3b938705 100644
--- a/extras/vom/vom/gbp_recirc.hpp
+++ b/extras/deprecated/vom/vom/gbp_recirc.hpp
@@ -199,7 +199,7 @@ private:
 }; // namespace VOM
 
 /*
- * fd.io coding-style-patch-verification: ON
+ * fd.io coding-style-patch-verification: OFF
  *
  * Local Variables:
  * eval: (c-set-style "mozilla")
diff --git a/extras/vom/vom/gbp_recirc_cmds.cpp b/extras/deprecated/vom/vom/gbp_recirc_cmds.cpp
index 90b931c0ced..a1832977adf 100644
--- a/extras/vom/vom/gbp_recirc_cmds.cpp
+++ b/extras/deprecated/vom/vom/gbp_recirc_cmds.cpp
@@ -130,7 +130,7 @@ dump_cmd::to_string() const
 }; // namespace VOM
 
 /*
- * fd.io coding-style-patch-verification: ON
+ * fd.io coding-style-patch-verification: OFF
  *
  * Local Variables:
  * eval: (c-set-style "mozilla")
diff --git a/extras/vom/vom/gbp_recirc_cmds.hpp b/extras/deprecated/vom/vom/gbp_recirc_cmds.hpp
index 9d95bf16195..4e74bd49b7d 100644
--- a/extras/vom/vom/gbp_recirc_cmds.hpp
+++ b/extras/deprecated/vom/vom/gbp_recirc_cmds.hpp
@@ -125,7 +125,7 @@ private:
 }; // namespace VOM
 
 /*
- * fd.io coding-style-patch-verification: ON
+ * fd.io coding-style-patch-verification: OFF
  *
  * Local Variables:
  * eval: (c-set-style "mozilla")
diff --git a/extras/vom/vom/gbp_route_domain.cpp b/extras/deprecated/vom/vom/gbp_route_domain.cpp
index 54b51cf88a3..0bb516d02e9 100644
--- a/extras/vom/vom/gbp_route_domain.cpp
+++ b/extras/deprecated/vom/vom/gbp_route_domain.cpp
@@ -271,7 +271,7 @@ gbp_route_domain::event_handler::show(std::ostream& os)
 }
 
 /*
- * fd.io coding-style-patch-verification: ON
+ * fd.io coding-style-patch-verification: OFF
  *
  * Local Variables:
  * eval: (c-set-style "mozilla")
diff --git a/extras/vom/vom/gbp_route_domain.hpp b/extras/deprecated/vom/vom/gbp_route_domain.hpp
index dd096738297..310e9e328c8 100644
--- a/extras/vom/vom/gbp_route_domain.hpp
+++ b/extras/deprecated/vom/vom/gbp_route_domain.hpp
@@ -187,7 +187,7 @@ private:
 }; // namespace
 
 /*
- * fd.io coding-style-patch-verification: ON
+ * fd.io coding-style-patch-verification: OFF
  *
  * Local Variables:
  * eval: (c-set-style "mozilla")
diff --git a/extras/vom/vom/gbp_route_domain_cmds.cpp b/extras/deprecated/vom/vom/gbp_route_domain_cmds.cpp
index 90e81f338e3..9b6457e1333 100644
--- a/extras/vom/vom/gbp_route_domain_cmds.cpp
+++ b/extras/deprecated/vom/vom/gbp_route_domain_cmds.cpp
@@ -132,7 +132,7 @@ dump_cmd::to_string() const
 }; // namespace VOM
 
 /*
- * fd.io coding-style-patch-verification: ON
+ * fd.io coding-style-patch-verification: OFF
  *
  * Local Variables:
  * eval: (c-set-style "mozilla")
diff --git a/extras/vom/vom/gbp_route_domain_cmds.hpp b/extras/deprecated/vom/vom/gbp_route_domain_cmds.hpp
index 6ef9fcd3ce9..577f334154a 100644
--- a/extras/vom/vom/gbp_route_domain_cmds.hpp
+++ b/extras/deprecated/vom/vom/gbp_route_domain_cmds.hpp
@@ -123,7 +123,7 @@ private:
 }; // VOM
 
 /*
- * fd.io coding-style-patch-verification: ON
+ * fd.io coding-style-patch-verification: OFF
  *
  * Local Variables:
  * eval: (c-set-style "mozilla")
diff --git a/extras/vom/vom/gbp_rule.cpp b/extras/deprecated/vom/vom/gbp_rule.cpp
index 48c59b14c2b..5d13850d2d9 100644
--- a/extras/vom/vom/gbp_rule.cpp
+++ b/extras/deprecated/vom/vom/gbp_rule.cpp
@@ -220,7 +220,7 @@ gbp_rule::nhs() const
 }; // namespace VOM
 
 /*
- * fd.io coding-style-patch-verification: ON
+ * fd.io coding-style-patch-verification: OFF
  *
  * Local Variables:
  * eval: (c-set-style "mozilla")
diff --git a/extras/vom/vom/gbp_rule.hpp b/extras/deprecated/vom/vom/gbp_rule.hpp
index 04301da79e9..1871e7e14a6 100644
--- a/extras/vom/vom/gbp_rule.hpp
+++ b/extras/deprecated/vom/vom/gbp_rule.hpp
@@ -272,7 +272,7 @@ private:
 };
 
 /*
- * fd.io coding-style-patch-verification: ON
+ * fd.io coding-style-patch-verification: OFF
  *
  * Local Variables:
  * eval: (c-set-style "mozilla")
diff --git a/extras/vom/vom/gbp_subnet.cpp b/extras/deprecated/vom/vom/gbp_subnet.cpp
index bc897f125db..13d1b41adc1 100644
--- a/extras/vom/vom/gbp_subnet.cpp
+++ b/extras/deprecated/vom/vom/gbp_subnet.cpp
@@ -291,7 +291,7 @@ operator<<(std::ostream& os, const gbp_subnet::key_t& key)
 } // namespace VOM
 
 /*
- * fd.io coding-style-patch-verification: ON
+ * fd.io coding-style-patch-verification: OFF
  *
  * Local Variables:
  * eval: (c-set-style "mozilla")
diff --git a/extras/vom/vom/gbp_subnet.hpp b/extras/deprecated/vom/vom/gbp_subnet.hpp
index 3ae8439e83c..09132763f0e 100644
--- a/extras/vom/vom/gbp_subnet.hpp
+++ b/extras/deprecated/vom/vom/gbp_subnet.hpp
@@ -242,7 +242,7 @@ std::ostream& operator<<(std::ostream& os, const gbp_subnet::key_t& key);
 }; // namespace
 
 /*
- * fd.io coding-style-patch-verification: ON
+ * fd.io coding-style-patch-verification: OFF
  *
  * Local Variables:
  * eval: (c-set-style "mozilla")
diff --git a/extras/vom/vom/gbp_subnet_cmds.cpp b/extras/deprecated/vom/vom/gbp_subnet_cmds.cpp
index 94152ffe369..765f9403629 100644
--- a/extras/vom/vom/gbp_subnet_cmds.cpp
+++ b/extras/deprecated/vom/vom/gbp_subnet_cmds.cpp
@@ -158,7 +158,7 @@ dump_cmd::to_string() const
 }; // namespace VOM
 
 /*
- * fd.io coding-style-patch-verification: ON
+ * fd.io coding-style-patch-verification: OFF
  *
  * Local Variables:
  * eval: (c-set-style "mozilla")
diff --git a/extras/vom/vom/gbp_subnet_cmds.hpp b/extras/deprecated/vom/vom/gbp_subnet_cmds.hpp
index b78699e5bf5..3801a5b4783 100644
--- a/extras/vom/vom/gbp_subnet_cmds.hpp
+++ b/extras/deprecated/vom/vom/gbp_subnet_cmds.hpp
@@ -132,7 +132,7 @@ private:
 }; // namespace VOM
 
 /*
- * fd.io coding-style-patch-verification: ON
+ * fd.io coding-style-patch-verification: OFF
  *
  * Local Variables:
  * eval: (c-set-style "mozilla")
diff --git a/extras/vom/vom/gbp_types.hpp b/extras/deprecated/vom/vom/gbp_types.hpp
index 5b46e08f513..bbcc9195da8 100644
--- a/extras/vom/vom/gbp_types.hpp
+++ b/extras/deprecated/vom/vom/gbp_types.hpp
@@ -30,7 +30,7 @@ typedef uint16_t scope_t;
 }; // namespace
 
 /*
- * fd.io coding-style-patch-verification: ON
+ * fd.io coding-style-patch-verification: OFF
  *
  * Local Variables:
  * eval: (c-set-style "mozilla")
diff --git a/extras/vom/vom/gbp_vxlan.cpp b/extras/deprecated/vom/vom/gbp_vxlan.cpp
index 76826c2a3d6..32d1db9da64 100644
--- a/extras/vom/vom/gbp_vxlan.cpp
+++ b/extras/deprecated/vom/vom/gbp_vxlan.cpp
@@ -233,7 +233,7 @@ gbp_vxlan::event_handler::show(std::ostream& os)
 }
 
 /*
- * fd.io coding-style-patch-verification: ON
+ * fd.io coding-style-patch-verification: OFF
  *
  * Local Variables:
  * eval: (c-set-style "mozilla")
diff --git a/extras/vom/vom/gbp_vxlan.hpp b/extras/deprecated/vom/vom/gbp_vxlan.hpp
index 8aa4b6b6b6e..a3e223b0b3f 100644
--- a/extras/vom/vom/gbp_vxlan.hpp
+++ b/extras/deprecated/vom/vom/gbp_vxlan.hpp
@@ -181,7 +181,7 @@ private:
 }; // namespace VOM
 
 /*
- * fd.io coding-style-patch-verification: ON
+ * fd.io coding-style-patch-verification: OFF
  *
  * Local Variables:
  * eval: (c-set-style "mozilla")
diff --git a/extras/vom/vom/gbp_vxlan_cmds.cpp b/extras/deprecated/vom/vom/gbp_vxlan_cmds.cpp
index 86b61c14f06..e35e4e976bd 100644
--- a/extras/vom/vom/gbp_vxlan_cmds.cpp
+++ b/extras/deprecated/vom/vom/gbp_vxlan_cmds.cpp
@@ -131,7 +131,7 @@ dump_cmd::to_string() const
 } // namespace VOM
 
 /*
- * fd.io coding-style-patch-verification: ON
+ * fd.io coding-style-patch-verification: OFF
  *
  * Local Variables:
  * eval: (c-set-style "mozilla")
diff --git a/extras/vom/vom/gbp_vxlan_cmds.hpp b/extras/deprecated/vom/vom/gbp_vxlan_cmds.hpp
index 642235731bb..396ef7443e7 100644
--- a/extras/vom/vom/gbp_vxlan_cmds.hpp
+++ b/extras/deprecated/vom/vom/gbp_vxlan_cmds.hpp
@@ -127,7 +127,7 @@ private:
 }; // VOM
 
 /*
- * fd.io coding-style-patch-verification: ON
+ * fd.io coding-style-patch-verification: OFF
  *
  * Local Variables:
  * eval: (c-set-style "mozilla")
diff --git a/extras/vom/vom/hw.cpp b/extras/deprecated/vom/vom/hw.cpp
index 54f0aa2c02f..932a014b9f7 100644
--- a/extras/vom/vom/hw.cpp
+++ b/extras/deprecated/vom/vom/hw.cpp
@@ -298,7 +298,7 @@ HW::item<unsigned int>::to_string() const
 }
 
 /*
- * fd.io coding-style-patch-verification: ON
+ * fd.io coding-style-patch-verification: OFF
  *
  * Local Variables:
  * eval: (c-set-style "mozilla")
diff --git a/extras/vom/vom/hw.hpp b/extras/deprecated/vom/vom/hw.hpp
index d10a93aa59b..e828139c83c 100644
--- a/extras/vom/vom/hw.hpp
+++ b/extras/deprecated/vom/vom/hw.hpp
@@ -386,7 +386,7 @@ std::string HW::item<unsigned int>::to_string() const;
 };
 
 /*
- * fd.io coding-style-patch-verification: ON
+ * fd.io coding-style-patch-verification: OFF
  *
  * Local Variables:
  * eval: (c-set-style "mozilla")
diff --git a/extras/vom/vom/hw_cmds.cpp b/extras/deprecated/vom/vom/hw_cmds.cpp
index 429c123e9e9..5f36b865bb6 100644
--- a/extras/vom/vom/hw_cmds.cpp
+++ b/extras/deprecated/vom/vom/hw_cmds.cpp
@@ -46,7 +46,7 @@ poll::to_string() const
 };
 
 /*
- * fd.io coding-style-patch-verification: ON
+ * fd.io coding-style-patch-verification: OFF
  *
  * Local Variables:
  * eval: (c-set-style "mozilla")
diff --git a/extras/vom/vom/hw_cmds.hpp b/extras/deprecated/vom/vom/hw_cmds.hpp
index c10f71e524c..031556a8337 100644
--- a/extras/vom/vom/hw_cmds.hpp
+++ b/extras/deprecated/vom/vom/hw_cmds.hpp
@@ -54,7 +54,7 @@ public:
 };
 
 /*
- * fd.io coding-style-patch-verification: ON
+ * fd.io coding-style-patch-verification: OFF
  *
  * Local Variables:
  * eval: (c-set-style "mozilla")
diff --git a/extras/vom/vom/igmp_binding.cpp b/extras/deprecated/vom/vom/igmp_binding.cpp
index 73e0bd8f02a..5e4b0343d36 100644
--- a/extras/vom/vom/igmp_binding.cpp
+++ b/extras/deprecated/vom/vom/igmp_binding.cpp
@@ -154,7 +154,7 @@ igmp_binding::event_handler::show(std::ostream& os)
 }
 }
 /*
- * fd.io coding-style-patch-verification: ON
+ * fd.io coding-style-patch-verification: OFF
  *
  * Local Variables:
  * eval: (c-set-style "mozilla")
diff --git a/extras/vom/vom/igmp_binding.hpp b/extras/deprecated/vom/vom/igmp_binding.hpp
index 56af8d1117e..484bea6e9eb 100644
--- a/extras/vom/vom/igmp_binding.hpp
+++ b/extras/deprecated/vom/vom/igmp_binding.hpp
@@ -173,7 +173,7 @@ private:
 };
 
 /*
- * fd.io coding-style-patch-verification: ON
+ * fd.io coding-style-patch-verification: OFF
  *
  * Local Variables:
  * eval: (c-set-style "mozilla")
diff --git a/extras/vom/vom/igmp_binding_cmds.cpp b/extras/deprecated/vom/vom/igmp_binding_cmds.cpp
index 133509e4e75..e18cb5b0834 100644
--- a/extras/vom/vom/igmp_binding_cmds.cpp
+++ b/extras/deprecated/vom/vom/igmp_binding_cmds.cpp
@@ -97,7 +97,7 @@ unbind_cmd::to_string() const
 }; // namespace VOM
 
 /*
- * fd.io coding-style-patch-verification: ON
+ * fd.io coding-style-patch-verification: OFF
  *
  * Local Variables:
  * eval: (c-set-style "mozilla")
diff --git a/extras/vom/vom/igmp_binding_cmds.hpp b/extras/deprecated/vom/vom/igmp_binding_cmds.hpp
index 25a1a67215a..29766151bb7 100644
--- a/extras/vom/vom/igmp_binding_cmds.hpp
+++ b/extras/deprecated/vom/vom/igmp_binding_cmds.hpp
@@ -91,7 +91,7 @@ private:
 }; // namespace VOM
 
 /*
- * fd.io coding-style-patch-verification: ON
+ * fd.io coding-style-patch-verification: OFF
  *
  * Local Variables:
  * eval: (c-set-style "mozilla")
diff --git a/extras/vom/vom/igmp_listen.cpp b/extras/deprecated/vom/vom/igmp_listen.cpp
index 8d321add65d..9536bfb8859 100644
--- a/extras/vom/vom/igmp_listen.cpp
+++ b/extras/deprecated/vom/vom/igmp_listen.cpp
@@ -180,7 +180,7 @@ igmp_listen::event_handler::show(std::ostream& os)
 }
 
 /*
- * fd.io coding-style-patch-verification: ON
+ * fd.io coding-style-patch-verification: OFF
  *
  * Local Variables:
  * eval: (c-set-style "mozilla")
diff --git a/extras/vom/vom/igmp_listen.hpp b/extras/deprecated/vom/vom/igmp_listen.hpp
index 4f07e759b09..44701d4bf44 100644
--- a/extras/vom/vom/igmp_listen.hpp
+++ b/extras/deprecated/vom/vom/igmp_listen.hpp
@@ -191,7 +191,7 @@ std::ostream& operator<<(std::ostream& os, const igmp_listen::key_t& key);
 };
 
 /*
- * fd.io coding-style-patch-verification: ON
+ * fd.io coding-style-patch-verification: OFF
  *
  * Local Variables:
  * eval: (c-set-style "mozilla")
diff --git a/extras/vom/vom/igmp_listen_cmds.cpp b/extras/deprecated/vom/vom/igmp_listen_cmds.cpp
index 69e243d9b4a..99a994d8cc8 100644
--- a/extras/vom/vom/igmp_listen_cmds.cpp
+++ b/extras/deprecated/vom/vom/igmp_listen_cmds.cpp
@@ -169,7 +169,7 @@ dump_cmd::to_string() const
 }; // namespace VOM
 
 /*
- * fd.io coding-style-patch-verification: ON
+ * fd.io coding-style-patch-verification: OFF
  *
  * Local Variables:
  * eval: (c-set-style "mozilla")
diff --git a/extras/vom/vom/igmp_listen_cmds.hpp b/extras/deprecated/vom/vom/igmp_listen_cmds.hpp
index 5bfea47914b..1a1ca0facdc 100644
--- a/extras/vom/vom/igmp_listen_cmds.hpp
+++ b/extras/deprecated/vom/vom/igmp_listen_cmds.hpp
@@ -152,7 +152,7 @@ private:
 }; // namespace VOM
 
 /*
- * fd.io coding-style-patch-verification: ON
+ * fd.io coding-style-patch-verification: OFF
  *
  * Local Variables:
  * eval: (c-set-style "mozilla")
diff --git a/extras/vom/vom/inspect.cpp b/extras/deprecated/vom/vom/inspect.cpp
index 605a921b5ac..436c1f571fa 100644
--- a/extras/vom/vom/inspect.cpp
+++ b/extras/deprecated/vom/vom/inspect.cpp
@@ -99,7 +99,7 @@ inspect::register_handler(const std::vector<std::string>& cmds,
 }
 }
 /*
- * fd.io coding-style-patch-verification: ON
+ * fd.io coding-style-patch-verification: OFF
  *
  * Local Variables:
  * eval: (c-set-style "mozilla")
diff --git a/extras/vom/vom/inspect.hpp b/extras/deprecated/vom/vom/inspect.hpp
index d5bca3040d2..a3f3d4935c0 100644
--- a/extras/vom/vom/inspect.hpp
+++ b/extras/deprecated/vom/vom/inspect.hpp
@@ -86,7 +86,7 @@ private:
 };
 
 /*
- * fd.io coding-style-patch-verification: ON
+ * fd.io coding-style-patch-verification: OFF
  *
  * Local Variables:
  * eval: (c-set-style "mozilla")
diff --git a/extras/vom/vom/interface.cpp b/extras/deprecated/vom/vom/interface.cpp
index 70035648d06..fcb88b3554c 100644
--- a/extras/vom/vom/interface.cpp
+++ b/extras/deprecated/vom/vom/interface.cpp
@@ -768,7 +768,7 @@ interface::event_handler::show(std::ostream& os)
 } // namespace VOM
 
 /*
- * fd.io coding-style-patch-verification: ON
+ * fd.io coding-style-patch-verification: OFF
  *
  * Local Variables:
  * eval: (c-set-style "mozilla")
diff --git a/extras/vom/vom/interface.hpp b/extras/deprecated/vom/vom/interface.hpp
index a1098c11329..53225f9b192 100644
--- a/extras/vom/vom/interface.hpp
+++ b/extras/deprecated/vom/vom/interface.hpp
@@ -749,7 +749,7 @@ private:
 std::ostream& operator<<(std::ostream& os, const interface::stats_t& stats);
 };
 /*
- * fd.io coding-style-patch-verification: ON
+ * fd.io coding-style-patch-verification: OFF
  *
  * Local Variables:
  * eval: (c-set-style "mozilla")
diff --git a/extras/vom/vom/interface_cmds.cpp b/extras/deprecated/vom/vom/interface_cmds.cpp
index 691040dd5f1..d043a38b068 100644
--- a/extras/vom/vom/interface_cmds.cpp
+++ b/extras/deprecated/vom/vom/interface_cmds.cpp
@@ -660,7 +660,7 @@ set_tag::operator==(const set_tag& o) const
 }; // namespace VOM
 
 /*
- * fd.io coding-style-patch-verification: ON
+ * fd.io coding-style-patch-verification: OFF
  *
  * Local Variables:
  * eval: (c-set-style "mozilla")
diff --git a/extras/vom/vom/interface_cmds.hpp b/extras/deprecated/vom/vom/interface_cmds.hpp
index 2ee892fc0f8..7c527ff85a0 100644
--- a/extras/vom/vom/interface_cmds.hpp
+++ b/extras/deprecated/vom/vom/interface_cmds.hpp
@@ -530,7 +530,7 @@ public:
 };
 };
 /*
- * fd.io coding-style-patch-verification: ON
+ * fd.io coding-style-patch-verification: OFF
  *
  * Local Variables:
  * eval: (c-set-style "mozilla")
diff --git a/extras/vom/vom/interface_factory.cpp b/extras/deprecated/vom/vom/interface_factory.cpp
index f0b25ffd837..746fbe38809 100644
--- a/extras/vom/vom/interface_factory.cpp
+++ b/extras/deprecated/vom/vom/interface_factory.cpp
@@ -245,7 +245,7 @@ interface_factory::new_pipe_interface(const vapi_payload_pipe_details& payload)
 }; // namespace VOM
 
 /*
- * fd.io coding-style-patch-verification: ON
+ * fd.io coding-style-patch-verification: OFF
  *
  * Local Variables:
  * eval: (c-set-style "mozilla")
diff --git a/extras/vom/vom/interface_factory.hpp b/extras/deprecated/vom/vom/interface_factory.hpp
index fef2b638c18..7b9703aab56 100644
--- a/extras/vom/vom/interface_factory.hpp
+++ b/extras/deprecated/vom/vom/interface_factory.hpp
@@ -63,7 +63,7 @@ public:
 };
 
 /*
- * fd.io coding-style-patch-verification: ON
+ * fd.io coding-style-patch-verification: OFF
  *
  * Local Variables:
  * eval: (c-set-style "mozilla")
diff --git a/extras/vom/vom/interface_ip6_nd.hpp b/extras/deprecated/vom/vom/interface_ip6_nd.hpp
index fa5a479248c..b8933ee1574 100644
--- a/extras/vom/vom/interface_ip6_nd.hpp
+++ b/extras/deprecated/vom/vom/interface_ip6_nd.hpp
@@ -372,7 +372,7 @@ typename interface_ip6_nd<CLASS, CMD>::event_handler
 };
 
 /*
- * fd.io coding-style-patch-verification: ON
+ * fd.io coding-style-patch-verification: OFF
  *
  * Local Variables:
  * eval: (c-set-style "mozilla")
diff --git a/extras/vom/vom/interface_ip6_nd_cmds.cpp b/extras/deprecated/vom/vom/interface_ip6_nd_cmds.cpp
index 15ff1caa4b4..c8a8d75dbec 100644
--- a/extras/vom/vom/interface_ip6_nd_cmds.cpp
+++ b/extras/deprecated/vom/vom/interface_ip6_nd_cmds.cpp
@@ -90,7 +90,7 @@ ip6nd_ra_prefix::unconfig_cmd::issue(connection& con)
 }
 
 /*
- * fd.io coding-style-patch-verification: ON
+ * fd.io coding-style-patch-verification: OFF
  *
  * Local Variables:
  * eval: (c-set-style "mozilla")
diff --git a/extras/vom/vom/interface_span.cpp b/extras/deprecated/vom/vom/interface_span.cpp
index 283ea1ece54..4dee9f2fd82 100644
--- a/extras/vom/vom/interface_span.cpp
+++ b/extras/deprecated/vom/vom/interface_span.cpp
@@ -211,7 +211,7 @@ interface_span::state_t::from_int(uint8_t i)
 }
 
 /*
- * fd.io coding-style-patch-verification: ON
+ * fd.io coding-style-patch-verification: OFF
  *
  * Local Variables:
  * eval: (c-set-style "mozilla")
diff --git a/extras/vom/vom/interface_span.hpp b/extras/deprecated/vom/vom/interface_span.hpp
index baa2054a530..7eabb1c4ab3 100644
--- a/extras/vom/vom/interface_span.hpp
+++ b/extras/deprecated/vom/vom/interface_span.hpp
@@ -212,7 +212,7 @@ std::ostream& operator<<(std::ostream& os, const interface_span::key_t& key);
 };
 
 /*
- * fd.io coding-style-patch-verification: ON
+ * fd.io coding-style-patch-verification: OFF
  *
  * Local Variables:
  * eval: (c-set-style "mozilla")
diff --git a/extras/vom/vom/interface_span_cmds.cpp b/extras/deprecated/vom/vom/interface_span_cmds.cpp
index 00dbdd0b895..7ee68d3a2e7 100644
--- a/extras/vom/vom/interface_span_cmds.cpp
+++ b/extras/deprecated/vom/vom/interface_span_cmds.cpp
@@ -141,7 +141,7 @@ dump_cmd::to_string() const
 }; // namespace VOM
 
 /*
- * fd.io coding-style-patch-verification: ON
+ * fd.io coding-style-patch-verification: OFF
  *
  * Local Variables:
  * eval: (c-set-style "mozilla")
diff --git a/extras/vom/vom/interface_span_cmds.hpp b/extras/deprecated/vom/vom/interface_span_cmds.hpp
index e83ed728fb1..c1573e9af1c 100644
--- a/extras/vom/vom/interface_span_cmds.hpp
+++ b/extras/deprecated/vom/vom/interface_span_cmds.hpp
@@ -144,7 +144,7 @@ private:
 };
 
 /*
- * fd.io coding-style-patch-verification: ON
+ * fd.io coding-style-patch-verification: OFF
  *
  * Local Variables:
  * eval: (c-set-style "mozilla")
diff --git a/extras/vom/vom/interface_types.cpp b/extras/deprecated/vom/vom/interface_types.cpp
index 239c3e6abf6..e63204bd0aa 100644
--- a/extras/vom/vom/interface_types.cpp
+++ b/extras/deprecated/vom/vom/interface_types.cpp
@@ -111,7 +111,7 @@ interface::oper_state_t::from_int(uint8_t v)
 }
 
 /*
- * fd.io coding-style-patch-verification: ON
+ * fd.io coding-style-patch-verification: OFF
  *
  * Local Variables:
  * eval: (c-set-style "mozilla")
diff --git a/extras/vom/vom/ip_punt_redirect.cpp b/extras/deprecated/vom/vom/ip_punt_redirect.cpp
index 853546fe397..667a2a0b60e 100644
--- a/extras/vom/vom/ip_punt_redirect.cpp
+++ b/extras/deprecated/vom/vom/ip_punt_redirect.cpp
@@ -189,7 +189,7 @@ ip_punt_redirect::event_handler::show(std::ostream& os)
 }
 
 /*
- * fd.io coding-style-patch-verification: ON
+ * fd.io coding-style-patch-verification: OFF
  *
  * Local Variables:
  * eval: (c-set-style "mozilla")
diff --git a/extras/vom/vom/ip_punt_redirect.hpp b/extras/deprecated/vom/vom/ip_punt_redirect.hpp
index ed9cf34992c..59e54566ef7 100644
--- a/extras/vom/vom/ip_punt_redirect.hpp
+++ b/extras/deprecated/vom/vom/ip_punt_redirect.hpp
@@ -186,7 +186,7 @@ private:
 };
 
 /*
- * fd.io coding-style-patch-verification: ON
+ * fd.io coding-style-patch-verification: OFF
  *
  * Local Variables:
  * eval: (c-set-style "mozilla")
diff --git a/extras/vom/vom/ip_punt_redirect_cmds.cpp b/extras/deprecated/vom/vom/ip_punt_redirect_cmds.cpp
index 419e3f17fba..95ce7b48035 100644
--- a/extras/vom/vom/ip_punt_redirect_cmds.cpp
+++ b/extras/deprecated/vom/vom/ip_punt_redirect_cmds.cpp
@@ -142,7 +142,7 @@ dump_cmd::to_string() const
 }; // namespace VOM
 
 /*
- * fd.io coding-style-patch-verification: ON
+ * fd.io coding-style-patch-verification: OFF
  *
  * Local Variables:
  * eval: (c-set-style "mozilla")
diff --git a/extras/vom/vom/ip_punt_redirect_cmds.hpp b/extras/deprecated/vom/vom/ip_punt_redirect_cmds.hpp
index 22e2a62a23c..236e6e310af 100644
--- a/extras/vom/vom/ip_punt_redirect_cmds.hpp
+++ b/extras/deprecated/vom/vom/ip_punt_redirect_cmds.hpp
@@ -149,7 +149,7 @@ private:
 }; // namespace VOM
 
 /*
- * fd.io coding-style-patch-verification: ON
+ * fd.io coding-style-patch-verification: OFF
  *
  * Local Variables:
  * eval: (c-set-style "mozilla")
diff --git a/extras/vom/vom/ip_unnumbered.cpp b/extras/deprecated/vom/vom/ip_unnumbered.cpp
index 74a6edeceeb..59834ecfc64 100644
--- a/extras/vom/vom/ip_unnumbered.cpp
+++ b/extras/deprecated/vom/vom/ip_unnumbered.cpp
@@ -154,7 +154,7 @@ ip_unnumbered::event_handler::show(std::ostream& os)
 }
 
 /*
- * fd.io coding-style-patch-verification: ON
+ * fd.io coding-style-patch-verification: OFF
  *
  * Local Variables:
  * eval: (c-set-style "mozilla")
diff --git a/extras/vom/vom/ip_unnumbered.hpp b/extras/deprecated/vom/vom/ip_unnumbered.hpp
index b736919744c..f6fef88adbb 100644
--- a/extras/vom/vom/ip_unnumbered.hpp
+++ b/extras/deprecated/vom/vom/ip_unnumbered.hpp
@@ -165,7 +165,7 @@ private:
 };
 
 /*
- * fd.io coding-style-patch-verification: ON
+ * fd.io coding-style-patch-verification: OFF
  *
  * Local Variables:
  * eval: (c-set-style "mozilla")
diff --git a/extras/vom/vom/ip_unnumbered_cmds.cpp b/extras/deprecated/vom/vom/ip_unnumbered_cmds.cpp
index 227a1509e7e..fd5020537c0 100644
--- a/extras/vom/vom/ip_unnumbered_cmds.cpp
+++ b/extras/deprecated/vom/vom/ip_unnumbered_cmds.cpp
@@ -134,7 +134,7 @@ dump_cmd::to_string() const
 }; // namespace VOM
 
 /*
- * fd.io coding-style-patch-verification: ON
+ * fd.io coding-style-patch-verification: OFF
  *
  * Local Variables:
  * eval: (c-set-style "mozilla")
diff --git a/extras/vom/vom/ip_unnumbered_cmds.hpp b/extras/deprecated/vom/vom/ip_unnumbered_cmds.hpp
index 436b0c72130..7320122d643 100644
--- a/extras/vom/vom/ip_unnumbered_cmds.hpp
+++ b/extras/deprecated/vom/vom/ip_unnumbered_cmds.hpp
@@ -137,7 +137,7 @@ private:
 }; // namespace VOM
 
 /*
- * fd.io coding-style-patch-verification: ON
+ * fd.io coding-style-patch-verification: OFF
  *
  * Local Variables:
  * eval: (c-set-style "mozilla")
diff --git a/extras/vom/vom/l2_binding.cpp b/extras/deprecated/vom/vom/l2_binding.cpp
index 37039a0b930..e6de3035658 100644
--- a/extras/vom/vom/l2_binding.cpp
+++ b/extras/deprecated/vom/vom/l2_binding.cpp
@@ -232,7 +232,7 @@ l2_binding::event_handler::show(std::ostream& os)
 }
 
 /*
- * fd.io coding-style-patch-verification: ON
+ * fd.io coding-style-patch-verification: OFF
  *
  * Local Variables:
  * eval: (c-set-style "mozilla")
diff --git a/extras/vom/vom/l2_binding.hpp b/extras/deprecated/vom/vom/l2_binding.hpp
index de3608a2626..a8dfbe76f7d 100644
--- a/extras/vom/vom/l2_binding.hpp
+++ b/extras/deprecated/vom/vom/l2_binding.hpp
@@ -214,7 +214,7 @@ private:
 };
 
 /*
- * fd.io coding-style-patch-verification: ON
+ * fd.io coding-style-patch-verification: OFF
  *
  * Local Variables:
  * eval: (c-set-style "mozilla")
diff --git a/extras/vom/vom/l2_binding_cmds.cpp b/extras/deprecated/vom/vom/l2_binding_cmds.cpp
index 70413adb411..6e7adac44d2 100644
--- a/extras/vom/vom/l2_binding_cmds.cpp
+++ b/extras/deprecated/vom/vom/l2_binding_cmds.cpp
@@ -125,7 +125,7 @@ unbind_cmd::to_string() const
 }; // namespace VOM
 
 /*
- * fd.io coding-style-patch-verification: ON
+ * fd.io coding-style-patch-verification: OFF
  *
  * Local Variables:
  * eval: (c-set-style "mozilla")
diff --git a/extras/vom/vom/l2_binding_cmds.hpp b/extras/deprecated/vom/vom/l2_binding_cmds.hpp
index 45f90b0787f..625f6483c0e 100644
--- a/extras/vom/vom/l2_binding_cmds.hpp
+++ b/extras/deprecated/vom/vom/l2_binding_cmds.hpp
@@ -121,7 +121,7 @@ private:
 }; // namespace VOM
 
 /*
- * fd.io coding-style-patch-verification: ON
+ * fd.io coding-style-patch-verification: OFF
  *
  * Local Variables:
  * eval: (c-set-style "mozilla")
diff --git a/extras/vom/vom/l2_emulation.cpp b/extras/deprecated/vom/vom/l2_emulation.cpp
index 7bc7ed657d4..b665528b8ae 100644
--- a/extras/vom/vom/l2_emulation.cpp
+++ b/extras/deprecated/vom/vom/l2_emulation.cpp
@@ -160,7 +160,7 @@ l2_emulation::event_handler::show(std::ostream& os)
 }
 
 /*
- * fd.io coding-style-patch-verification: ON
+ * fd.io coding-style-patch-verification: OFF
  *
  * Local Variables:
  * eval: (c-set-style "mozilla")
diff --git a/extras/vom/vom/l2_emulation.hpp b/extras/deprecated/vom/vom/l2_emulation.hpp
index faf4df8b0a7..3a929a99daf 100644
--- a/extras/vom/vom/l2_emulation.hpp
+++ b/extras/deprecated/vom/vom/l2_emulation.hpp
@@ -170,7 +170,7 @@ private:
 };
 
 /*
- * fd.io coding-style-patch-verification: ON
+ * fd.io coding-style-patch-verification: OFF
  *
  * Local Variables:
  * eval: (c-set-style "mozilla")
diff --git a/extras/vom/vom/l2_emulation_cmds.cpp b/extras/deprecated/vom/vom/l2_emulation_cmds.cpp
index fac764a1c66..4083b3962ae 100644
--- a/extras/vom/vom/l2_emulation_cmds.cpp
+++ b/extras/deprecated/vom/vom/l2_emulation_cmds.cpp
@@ -97,7 +97,7 @@ disable_cmd::to_string() const
 }; // namespace VOM
 
 /*
- * fd.io coding-style-patch-verification: ON
+ * fd.io coding-style-patch-verification: OFF
  *
  * Local Variables:
  * eval: (c-set-style "mozilla")
diff --git a/extras/vom/vom/l2_emulation_cmds.hpp b/extras/deprecated/vom/vom/l2_emulation_cmds.hpp
index aab4af51faa..b4f10f80f28 100644
--- a/extras/vom/vom/l2_emulation_cmds.hpp
+++ b/extras/deprecated/vom/vom/l2_emulation_cmds.hpp
@@ -92,7 +92,7 @@ private:
 }; // namespace VOM
 
 /*
- * fd.io coding-style-patch-verification: ON
+ * fd.io coding-style-patch-verification: OFF
  *
  * Local Variables:
  * eval: (c-set-style "mozilla")
diff --git a/extras/vom/vom/l2_vtr.cpp b/extras/deprecated/vom/vom/l2_vtr.cpp
index 61505f68210..40c6ce4d894 100644
--- a/extras/vom/vom/l2_vtr.cpp
+++ b/extras/deprecated/vom/vom/l2_vtr.cpp
@@ -40,7 +40,7 @@ option_t::option_t(int v, const std::string s)
 }; // namespace VOM
 
 /*
- * fd.io coding-style-patch-verification: ON
+ * fd.io coding-style-patch-verification: OFF
  *
  * Local Variables:
  * eval: (c-set-style "mozilla")
diff --git a/extras/vom/vom/l2_vtr.hpp b/extras/deprecated/vom/vom/l2_vtr.hpp
index 688e87a8108..7f9840b970e 100644
--- a/extras/vom/vom/l2_vtr.hpp
+++ b/extras/deprecated/vom/vom/l2_vtr.hpp
@@ -43,7 +43,7 @@ private:
 }; // namesapce VOM
 
 /*
- * fd.io coding-style-patch-verification: ON
+ * fd.io coding-style-patch-verification: OFF
  *
  * Local Variables:
  * eval: (c-set-style "mozilla")
diff --git a/extras/vom/vom/l2_vtr_cmds.cpp b/extras/deprecated/vom/vom/l2_vtr_cmds.cpp
index 1c76cf0e490..24b49ddbed0 100644
--- a/extras/vom/vom/l2_vtr_cmds.cpp
+++ b/extras/deprecated/vom/vom/l2_vtr_cmds.cpp
@@ -65,7 +65,7 @@ set_cmd::to_string() const
 }; // namespace VOM
 
 /*
- * fd.io coding-style-patch-verification: ON
+ * fd.io coding-style-patch-verification: OFF
  *
  * Local Variables:
  * eval: (c-set-style "mozilla")
diff --git a/extras/vom/vom/l2_vtr_cmds.hpp b/extras/deprecated/vom/vom/l2_vtr_cmds.hpp
index 14477fd43f4..b30fdc88b7d 100644
--- a/extras/vom/vom/l2_vtr_cmds.hpp
+++ b/extras/deprecated/vom/vom/l2_vtr_cmds.hpp
@@ -66,7 +66,7 @@ private:
 }; // namespace VOM
 
 /*
- * fd.io coding-style-patch-verification: ON
+ * fd.io coding-style-patch-verification: OFF
  *
  * Local Variables:
  * eval: (c-set-style "mozilla")
diff --git a/extras/vom/vom/l2_xconnect.cpp b/extras/deprecated/vom/vom/l2_xconnect.cpp
index f54da6c8abf..91065ab3c08 100644
--- a/extras/vom/vom/l2_xconnect.cpp
+++ b/extras/deprecated/vom/vom/l2_xconnect.cpp
@@ -229,7 +229,7 @@ l2_xconnect::event_handler::show(std::ostream& os)
 }
 
 /*
- * fd.io coding-style-patch-verification: ON
+ * fd.io coding-style-patch-verification: OFF
  *
  * Local Variables:
  * eval: (c-set-style "mozilla")
diff --git a/extras/vom/vom/l2_xconnect.hpp b/extras/deprecated/vom/vom/l2_xconnect.hpp
index 89acc1c32e6..6fddf1507e1 100644
--- a/extras/vom/vom/l2_xconnect.hpp
+++ b/extras/deprecated/vom/vom/l2_xconnect.hpp
@@ -200,7 +200,7 @@ std::ostream& operator<<(std::ostream& os, const l2_xconnect::key_t& key);
 };
 
 /*
- * fd.io coding-style-patch-verification: ON
+ * fd.io coding-style-patch-verification: OFF
  *
  * Local Variables:
  * eval: (c-set-style "mozilla")
diff --git a/extras/vom/vom/l2_xconnect_cmds.cpp b/extras/deprecated/vom/vom/l2_xconnect_cmds.cpp
index 37eca9ecfc8..426a3dd2554 100644
--- a/extras/vom/vom/l2_xconnect_cmds.cpp
+++ b/extras/deprecated/vom/vom/l2_xconnect_cmds.cpp
@@ -136,7 +136,7 @@ dump_cmd::to_string() const
 }; // namespace VOM
 
 /*
- * fd.io coding-style-patch-verification: ON
+ * fd.io coding-style-patch-verification: OFF
  *
  * Local Variables:
  * eval: (c-set-style "mozilla")
diff --git a/extras/vom/vom/l2_xconnect_cmds.hpp b/extras/deprecated/vom/vom/l2_xconnect_cmds.hpp
index db0e721453f..9d2dddd8fdd 100644
--- a/extras/vom/vom/l2_xconnect_cmds.hpp
+++ b/extras/deprecated/vom/vom/l2_xconnect_cmds.hpp
@@ -137,7 +137,7 @@ public:
 }; // namespace VOM
 
 /*
- * fd.io coding-style-patch-verification: ON
+ * fd.io coding-style-patch-verification: OFF
  *
  * Local Variables:
  * eval: (c-set-style "mozilla")
diff --git a/extras/vom/vom/l3_binding.cpp b/extras/deprecated/vom/vom/l3_binding.cpp
index 6b8d36209a7..f34859fbaf9 100644
--- a/extras/vom/vom/l3_binding.cpp
+++ b/extras/deprecated/vom/vom/l3_binding.cpp
@@ -192,7 +192,7 @@ l3_binding::event_handler::show(std::ostream& os)
 }
 
 /*
- * fd.io coding-style-patch-verification: ON
+ * fd.io coding-style-patch-verification: OFF
  *
  * Local Variables:
  * eval: (c-set-style "mozilla")
diff --git a/extras/vom/vom/l3_binding.hpp b/extras/deprecated/vom/vom/l3_binding.hpp
index a2a46263dbd..6babe90c6a9 100644
--- a/extras/vom/vom/l3_binding.hpp
+++ b/extras/deprecated/vom/vom/l3_binding.hpp
@@ -199,7 +199,7 @@ std::ostream& operator<<(std::ostream& os, const l3_binding::key_t& key);
 };
 
 /*
- * fd.io coding-style-patch-verification: ON
+ * fd.io coding-style-patch-verification: OFF
  *
  * Local Variables:
  * eval: (c-set-style "mozilla")
diff --git a/extras/vom/vom/l3_binding_cmds.cpp b/extras/deprecated/vom/vom/l3_binding_cmds.cpp
index 15122bc9dd6..d3510c85400 100644
--- a/extras/vom/vom/l3_binding_cmds.cpp
+++ b/extras/deprecated/vom/vom/l3_binding_cmds.cpp
@@ -152,7 +152,7 @@ dump_v4_cmd::to_string() const
 }; // namespace VOM
 
 /*
- * fd.io coding-style-patch-verification: ON
+ * fd.io coding-style-patch-verification: OFF
  *
  * Local Variables:
  * eval: (c-set-style "mozilla")
diff --git a/extras/vom/vom/l3_binding_cmds.hpp b/extras/deprecated/vom/vom/l3_binding_cmds.hpp
index b7a30f8865c..42d5c0bf8c8 100644
--- a/extras/vom/vom/l3_binding_cmds.hpp
+++ b/extras/deprecated/vom/vom/l3_binding_cmds.hpp
@@ -148,7 +148,7 @@ private:
 }; // namespace VOM
 
 /*
- * fd.io coding-style-patch-verification: ON
+ * fd.io coding-style-patch-verification: OFF
  *
  * Local Variables:
  * eval: (c-set-style "mozilla")
diff --git a/extras/vom/vom/lldp_binding.cpp b/extras/deprecated/vom/vom/lldp_binding.cpp
index 69b30c2ce94..e2067a045ad 100644
--- a/extras/vom/vom/lldp_binding.cpp
+++ b/extras/deprecated/vom/vom/lldp_binding.cpp
@@ -155,7 +155,7 @@ lldp_binding::event_handler::show(std::ostream& os)
 }
 
 /*
- * fd.io coding-style-patch-verification: ON
+ * fd.io coding-style-patch-verification: OFF
  *
  * Local Variables:
  * eval: (c-set-style "mozilla")
diff --git a/extras/vom/vom/lldp_binding.hpp b/extras/deprecated/vom/vom/lldp_binding.hpp
index 0c5610013ac..d93425f88ba 100644
--- a/extras/vom/vom/lldp_binding.hpp
+++ b/extras/deprecated/vom/vom/lldp_binding.hpp
@@ -172,7 +172,7 @@ private:
 };
 
 /*
- * fd.io coding-style-patch-verification: ON
+ * fd.io coding-style-patch-verification: OFF
  *
  * Local Variables:
  * eval: (c-set-style "mozilla")
diff --git a/extras/vom/vom/lldp_binding_cmds.cpp b/extras/deprecated/vom/vom/lldp_binding_cmds.cpp
index 02ed8cd450a..05b6a663825 100644
--- a/extras/vom/vom/lldp_binding_cmds.cpp
+++ b/extras/deprecated/vom/vom/lldp_binding_cmds.cpp
@@ -102,7 +102,7 @@ unbind_cmd::to_string() const
 }; // namespace VOM
 
 /*
- * fd.io coding-style-patch-verification: ON
+ * fd.io coding-style-patch-verification: OFF
  *
  * Local Variables:
  * eval: (c-set-style "mozilla")
diff --git a/extras/vom/vom/lldp_binding_cmds.hpp b/extras/deprecated/vom/vom/lldp_binding_cmds.hpp
index 77ba8ee90e7..d880b2cf8a6 100644
--- a/extras/vom/vom/lldp_binding_cmds.hpp
+++ b/extras/deprecated/vom/vom/lldp_binding_cmds.hpp
@@ -100,7 +100,7 @@ private:
 }; // naemspace VOM
 
 /*
- * fd.io coding-style-patch-verification: ON
+ * fd.io coding-style-patch-verification: OFF
  *
  * Local Variables:
  * eval: (c-set-style "mozilla")
diff --git a/extras/vom/vom/lldp_global.cpp b/extras/deprecated/vom/vom/lldp_global.cpp
index 6bae7993651..11ab54b1605 100644
--- a/extras/vom/vom/lldp_global.cpp
+++ b/extras/deprecated/vom/vom/lldp_global.cpp
@@ -154,7 +154,7 @@ lldp_global::event_handler::show(std::ostream& os)
 }
 
 /*
- * fd.io coding-style-patch-verification: ON
+ * fd.io coding-style-patch-verification: OFF
  *
  * Local Variables:
  * eval: (c-set-style "mozilla")
diff --git a/extras/vom/vom/lldp_global.hpp b/extras/deprecated/vom/vom/lldp_global.hpp
index f545a2828cc..b0e86bfdf1d 100644
--- a/extras/vom/vom/lldp_global.hpp
+++ b/extras/deprecated/vom/vom/lldp_global.hpp
@@ -173,7 +173,7 @@ private:
 };
 
 /*
- * fd.io coding-style-patch-verification: ON
+ * fd.io coding-style-patch-verification: OFF
  *
  * Local Variables:
  * eval: (c-set-style "mozilla")
diff --git a/extras/vom/vom/lldp_global_cmds.cpp b/extras/deprecated/vom/vom/lldp_global_cmds.cpp
index 32931a621f0..5aeb941e9b2 100644
--- a/extras/vom/vom/lldp_global_cmds.cpp
+++ b/extras/deprecated/vom/vom/lldp_global_cmds.cpp
@@ -66,7 +66,7 @@ config_cmd::to_string() const
 }; // namespace VOM
 
 /*
- * fd.io coding-style-patch-verification: ON
+ * fd.io coding-style-patch-verification: OFF
  *
  * Local Variables:
  * eval: (c-set-style "mozilla")
diff --git a/extras/vom/vom/lldp_global_cmds.hpp b/extras/deprecated/vom/vom/lldp_global_cmds.hpp
index 732c700062f..4ce989689f6 100644
--- a/extras/vom/vom/lldp_global_cmds.hpp
+++ b/extras/deprecated/vom/vom/lldp_global_cmds.hpp
@@ -70,7 +70,7 @@ private:
 }; // namespace VOM
 
 /*
- * fd.io coding-style-patch-verification: ON
+ * fd.io coding-style-patch-verification: OFF
  *
  * Local Variables:
  * eval: (c-set-style "mozilla")
diff --git a/extras/vom/vom/logger.cpp b/extras/deprecated/vom/vom/logger.cpp
index 80f2d92c603..69de2f8f58e 100644
--- a/extras/vom/vom/logger.cpp
+++ b/extras/deprecated/vom/vom/logger.cpp
@@ -162,7 +162,7 @@ cout_handler::handle_message(const std::string& file,
 }; // namespace VOM
 
 /*
- * fd.io coding-style-patch-verification: ON
+ * fd.io coding-style-patch-verification: OFF
  *
  * Local Variables:
  * eval: (c-set-style "mozilla")
diff --git a/extras/vom/vom/logger.hpp b/extras/deprecated/vom/vom/logger.hpp
index 6d2e3dd82f6..9791d15624d 100644
--- a/extras/vom/vom/logger.hpp
+++ b/extras/deprecated/vom/vom/logger.hpp
@@ -184,7 +184,7 @@ log_t& logger();
 };
 
 /*
- * fd.io coding-style-patch-verification: ON
+ * fd.io coding-style-patch-verification: OFF
  *
  * Local Variables:
  * eval: (c-set-style "mozilla")
diff --git a/extras/vom/vom/mroute_cmds.cpp b/extras/deprecated/vom/vom/mroute_cmds.cpp
index 2f4dd6e1a86..e18e97d9d63 100644
--- a/extras/vom/vom/mroute_cmds.cpp
+++ b/extras/deprecated/vom/vom/mroute_cmds.cpp
@@ -166,7 +166,7 @@ dump_cmd::to_string() const
 } // namespace mroute
 } // namespace vom
   /*
-   * fd.io coding-style-patch-verification: ON
+   * fd.io coding-style-patch-verification: OFF
    *
    * Local Variables:
    * eval: (c-set-style "mozilla")
diff --git a/extras/vom/vom/mroute_cmds.hpp b/extras/deprecated/vom/vom/mroute_cmds.hpp
index 3392d4a3b2b..c9b8ad6afb9 100644
--- a/extras/vom/vom/mroute_cmds.hpp
+++ b/extras/deprecated/vom/vom/mroute_cmds.hpp
@@ -139,7 +139,7 @@ private:
 }; // namespace VOM
 
 /*
- * fd.io coding-style-patch-verification: ON
+ * fd.io coding-style-patch-verification: OFF
  *
  * Local Variables:
  * eval: (c-set-style "mozilla")
diff --git a/extras/vom/vom/nat_binding.cpp b/extras/deprecated/vom/vom/nat_binding.cpp
index a3fdee77be4..dda7e7802e7 100644
--- a/extras/vom/vom/nat_binding.cpp
+++ b/extras/deprecated/vom/vom/nat_binding.cpp
@@ -288,7 +288,7 @@ nat_binding::event_handler::show(std::ostream& os)
 }
 
 /*
- * fd.io coding-style-patch-verification: ON
+ * fd.io coding-style-patch-verification: OFF
  *
  * Local Variables:
  * eval: (c-set-style "mozilla")
diff --git a/extras/vom/vom/nat_binding.hpp b/extras/deprecated/vom/vom/nat_binding.hpp
index a99d23af601..49557e5cda0 100644
--- a/extras/vom/vom/nat_binding.hpp
+++ b/extras/deprecated/vom/vom/nat_binding.hpp
@@ -222,7 +222,7 @@ std::ostream& operator<<(std::ostream& os, const nat_binding::key_t& key);
 };
 
 /*
- * fd.io coding-style-patch-verification: ON
+ * fd.io coding-style-patch-verification: OFF
  *
  * Local Variables:
  * eval: (c-set-style "mozilla")
diff --git a/extras/vom/vom/nat_binding_cmds.cpp b/extras/deprecated/vom/vom/nat_binding_cmds.cpp
index 4e69a67f2af..2d2973ffa36 100644
--- a/extras/vom/vom/nat_binding_cmds.cpp
+++ b/extras/deprecated/vom/vom/nat_binding_cmds.cpp
@@ -367,7 +367,7 @@ dump_input_66_cmd::to_string() const
 }; // namespace VOM
 
 /*
- * fd.io coding-style-patch-verification: ON
+ * fd.io coding-style-patch-verification: OFF
  *
  * Local Variables:
  * eval: (c-set-style "mozilla")
diff --git a/extras/vom/vom/nat_binding_cmds.hpp b/extras/deprecated/vom/vom/nat_binding_cmds.hpp
index 40507e0374b..d64f474b228 100644
--- a/extras/vom/vom/nat_binding_cmds.hpp
+++ b/extras/deprecated/vom/vom/nat_binding_cmds.hpp
@@ -370,7 +370,7 @@ private:
 }; // namespace VOM
 
 /*
- * fd.io coding-style-patch-verification: ON
+ * fd.io coding-style-patch-verification: OFF
  *
  * Local Variables:
  * eval: (c-set-style "mozilla")
diff --git a/extras/vom/vom/nat_static.cpp b/extras/deprecated/vom/vom/nat_static.cpp
index bf8573d333e..10660dc45e2 100644
--- a/extras/vom/vom/nat_static.cpp
+++ b/extras/deprecated/vom/vom/nat_static.cpp
@@ -228,7 +228,7 @@ nat_static::event_handler::show(std::ostream& os)
 }
 
 /*
- * fd.io coding-style-patch-verification: ON
+ * fd.io coding-style-patch-verification: OFF
  *
  * Local Variables:
  * eval: (c-set-style "mozilla")
diff --git a/extras/vom/vom/nat_static.hpp b/extras/deprecated/vom/vom/nat_static.hpp
index 2dcadb3c904..b313667a82e 100644
--- a/extras/vom/vom/nat_static.hpp
+++ b/extras/deprecated/vom/vom/nat_static.hpp
@@ -185,7 +185,7 @@ std::ostream& operator<<(std::ostream& os, const nat_static::key_t& key);
 };
 
 /*
- * fd.io coding-style-patch-verification: ON
+ * fd.io coding-style-patch-verification: OFF
  *
  * Local Variables:
  * eval: (c-set-style "mozilla")
diff --git a/extras/vom/vom/nat_static_cmds.cpp b/extras/deprecated/vom/vom/nat_static_cmds.cpp
index 7e2b05f7f1e..296b226a650 100644
--- a/extras/vom/vom/nat_static_cmds.cpp
+++ b/extras/deprecated/vom/vom/nat_static_cmds.cpp
@@ -263,7 +263,7 @@ dump_66_cmd::to_string() const
 }; // namespace VOM
 
 /*
- * fd.io coding-style-patch-verification: ON
+ * fd.io coding-style-patch-verification: OFF
  *
  * Local Variables:
  * eval: (c-set-style "mozilla")
diff --git a/extras/vom/vom/nat_static_cmds.hpp b/extras/deprecated/vom/vom/nat_static_cmds.hpp
index 2213ef5ae47..281c05fa0d0 100644
--- a/extras/vom/vom/nat_static_cmds.hpp
+++ b/extras/deprecated/vom/vom/nat_static_cmds.hpp
@@ -239,7 +239,7 @@ private:
 }; // namespace vom
 
 /*
- * fd.io coding-style-patch-verification: ON
+ * fd.io coding-style-patch-verification: OFF
  *
  * Local Variables:
  * eval: (c-set-style "mozilla")
diff --git a/extras/vom/vom/neighbour.cpp b/extras/deprecated/vom/vom/neighbour.cpp
index a97892d7cdb..01653f6ced1 100644
--- a/extras/vom/vom/neighbour.cpp
+++ b/extras/deprecated/vom/vom/neighbour.cpp
@@ -224,7 +224,7 @@ neighbour::event_handler::show(std::ostream& os)
 }
 
 /*
- * fd.io coding-style-patch-verification: ON
+ * fd.io coding-style-patch-verification: OFF
  *
  * Local Variables:
  * eval: (c-set-style "mozilla")
diff --git a/extras/vom/vom/neighbour.hpp b/extras/deprecated/vom/vom/neighbour.hpp
index 5b1f9c12847..396b05e076b 100644
--- a/extras/vom/vom/neighbour.hpp
+++ b/extras/deprecated/vom/vom/neighbour.hpp
@@ -213,7 +213,7 @@ std::ostream& operator<<(std::ostream& os, const neighbour::key_t& key);
 };
 
 /*
- * fd.io coding-style-patch-verification: ON
+ * fd.io coding-style-patch-verification: OFF
  *
  * Local Variables:
  * eval: (c-set-style "mozilla")
diff --git a/extras/vom/vom/neighbour_cmds.cpp b/extras/deprecated/vom/vom/neighbour_cmds.cpp
index d507bb74ea8..4bf4f320cae 100644
--- a/extras/vom/vom/neighbour_cmds.cpp
+++ b/extras/deprecated/vom/vom/neighbour_cmds.cpp
@@ -164,7 +164,7 @@ dump_cmd::to_string() const
 } // namespace vom
 
 /*
- * fd.io coding-style-patch-verification: ON
+ * fd.io coding-style-patch-verification: OFF
  *
  * Local Variables:
  * eval: (c-set-style "mozilla")
diff --git a/extras/vom/vom/neighbour_cmds.hpp b/extras/deprecated/vom/vom/neighbour_cmds.hpp
index 024a021ce8d..024a021ce8d 100644
--- a/extras/vom/vom/neighbour_cmds.hpp
+++ b/extras/deprecated/vom/vom/neighbour_cmds.hpp
diff --git a/extras/vom/vom/object_base.cpp b/extras/deprecated/vom/vom/object_base.cpp
index 6ab4ee5cadc..ea39270b0f6 100644
--- a/extras/vom/vom/object_base.cpp
+++ b/extras/deprecated/vom/vom/object_base.cpp
@@ -62,7 +62,7 @@ operator<<(std::ostream& os, const object_base& o)
 }
 
 /*
- * fd.io coding-style-patch-verification: ON
+ * fd.io coding-style-patch-verification: OFF
  *
  * Local Variables:
  * eval: (c-set-style "mozilla")
diff --git a/extras/vom/vom/object_base.hpp b/extras/deprecated/vom/vom/object_base.hpp
index 2edafc58466..fb49d738eaf 100644
--- a/extras/vom/vom/object_base.hpp
+++ b/extras/deprecated/vom/vom/object_base.hpp
@@ -136,7 +136,7 @@ std::ostream& operator<<(std::ostream& os, const object_base& o);
 };
 
 /*
- * fd.io coding-style-patch-verification: ON
+ * fd.io coding-style-patch-verification: OFF
  *
  * Local Variables:
  * eval: (c-set-style "mozilla")
diff --git a/extras/vom/vom/om.cpp b/extras/deprecated/vom/vom/om.cpp
index edfc046e740..b522168fcd6 100644
--- a/extras/vom/vom/om.cpp
+++ b/extras/deprecated/vom/vom/om.cpp
@@ -148,7 +148,7 @@ OM::mark_n_sweep::~mark_n_sweep()
 }
 
 /*
- * fd.io coding-style-patch-verification: ON
+ * fd.io coding-style-patch-verification: OFF
  *
  * Local Variables:
  * eval: (c-set-style "mozilla")
diff --git a/extras/vom/vom/om.hpp b/extras/deprecated/vom/vom/om.hpp
index e68d5ea0017..0990393df8c 100644
--- a/extras/vom/vom/om.hpp
+++ b/extras/deprecated/vom/vom/om.hpp
@@ -346,7 +346,7 @@ private:
 }
 
 /*
- * fd.io coding-style-patch-verification: ON
+ * fd.io coding-style-patch-verification: OFF
  *
  * Local Variables:
  * eval: (c-set-style "mozilla")
diff --git a/extras/vom/vom/pipe.cpp b/extras/deprecated/vom/vom/pipe.cpp
index 9e10aeb4ea6..5f6a66d6a3e 100644
--- a/extras/vom/vom/pipe.cpp
+++ b/extras/deprecated/vom/vom/pipe.cpp
@@ -203,7 +203,7 @@ pipe::event_handler::show(std::ostream& os)
 }; // namespace VOM
 
 /*
- * fd.io coding-style-patch-verification: ON
+ * fd.io coding-style-patch-verification: OFF
  *
  * Local Variables:
  * eval: (c-set-style "mozilla")
diff --git a/extras/vom/vom/pipe.hpp b/extras/deprecated/vom/vom/pipe.hpp
index 7da3a1f162a..4468208a1c5 100644
--- a/extras/vom/vom/pipe.hpp
+++ b/extras/deprecated/vom/vom/pipe.hpp
@@ -161,7 +161,7 @@ private:
 }; // namespace VOM
 
 /*
- * fd.io coding-style-patch-verification: ON
+ * fd.io coding-style-patch-verification: OFF
  *
  * Local Variables:
  * eval: (c-set-style "mozilla")
diff --git a/extras/vom/vom/pipe_cmds.cpp b/extras/deprecated/vom/vom/pipe_cmds.cpp
index b01ec2f92fc..c866b048ddf 100644
--- a/extras/vom/vom/pipe_cmds.cpp
+++ b/extras/deprecated/vom/vom/pipe_cmds.cpp
@@ -144,7 +144,7 @@ dump_cmd::to_string() const
 } // namespace VOM
 
 /*
- * fd.io coding-style-patch-verification: ON
+ * fd.io coding-style-patch-verification: OFF
  *
  * Local Variables:
  * eval: (c-set-style "mozilla")
diff --git a/extras/vom/vom/pipe_cmds.hpp b/extras/deprecated/vom/vom/pipe_cmds.hpp
index 8c26fd60fd3..b3921393e6a 100644
--- a/extras/vom/vom/pipe_cmds.hpp
+++ b/extras/deprecated/vom/vom/pipe_cmds.hpp
@@ -121,7 +121,7 @@ public:
 }; // namespace VOM
 
 /*
- * fd.io coding-style-patch-verification: ON
+ * fd.io coding-style-patch-verification: OFF
  *
  * Local Variables:
  * eval: (c-set-style "mozilla")
diff --git a/extras/vom/vom/prefix.cpp b/extras/deprecated/vom/vom/prefix.cpp
index 45cb6df54c9..b9910d3f2fc 100644
--- a/extras/vom/vom/prefix.cpp
+++ b/extras/deprecated/vom/vom/prefix.cpp
@@ -584,7 +584,7 @@ route::mprefix_t::to_string() const
 }; // namespace VOM
 
 /*
- * fd.io coding-style-patch-verification: ON
+ * fd.io coding-style-patch-verification: OFF
  *
  * Local Variables:
  * eval: (c-set-style "mozilla")
diff --git a/extras/vom/vom/prefix.hpp b/extras/deprecated/vom/vom/prefix.hpp
index fada1d3e274..a6496326fc4 100644
--- a/extras/vom/vom/prefix.hpp
+++ b/extras/deprecated/vom/vom/prefix.hpp
@@ -404,7 +404,7 @@ boost::asio::ip::address from_bytes(uint8_t is_ip6, const uint8_t* array);
 };
 
 /*
- * fd.io coding-style-patch-verification: ON
+ * fd.io coding-style-patch-verification: OFF
  *
  * Local Variables:
  * eval: (c-set-style "mozilla")
diff --git a/extras/vom/vom/qos_map.cpp b/extras/deprecated/vom/vom/qos_map.cpp
index 9e382ec2f55..1f0dcc5a057 100644
--- a/extras/vom/vom/qos_map.cpp
+++ b/extras/deprecated/vom/vom/qos_map.cpp
@@ -182,7 +182,7 @@ map::event_handler::show(std::ostream& os)
 }; // namespace VOM
 
 /*
- * fd.io coding-style-patch-verification: ON
+ * fd.io coding-style-patch-verification: OFF
  *
  * Local Variables:
  * eval: (c-set-style "mozilla")
diff --git a/extras/vom/vom/qos_map.hpp b/extras/deprecated/vom/vom/qos_map.hpp
index 8d235c4994b..04a14451cd8 100644
--- a/extras/vom/vom/qos_map.hpp
+++ b/extras/deprecated/vom/vom/qos_map.hpp
@@ -172,7 +172,7 @@ private:
 }; // namespace VOM
 
 /*
- * fd.io coding-style-patch-verification: ON
+ * fd.io coding-style-patch-verification: OFF
  *
  * Local Variables:
  * eval: (c-set-style "mozilla")
diff --git a/extras/vom/vom/qos_map_cmds.cpp b/extras/deprecated/vom/vom/qos_map_cmds.cpp
index d9054a89fb2..8e1f7f8c015 100644
--- a/extras/vom/vom/qos_map_cmds.cpp
+++ b/extras/deprecated/vom/vom/qos_map_cmds.cpp
@@ -134,7 +134,7 @@ dump_cmd::to_string() const
 }; // namespace VOM
 
 /*
- * fd.io coding-style-patch-verification: ON
+ * fd.io coding-style-patch-verification: OFF
  *
  * Local Variables:
  * eval: (c-set-style "mozilla")
diff --git a/extras/vom/vom/qos_map_cmds.hpp b/extras/deprecated/vom/vom/qos_map_cmds.hpp
index 8321894d532..937bf7da209 100644
--- a/extras/vom/vom/qos_map_cmds.hpp
+++ b/extras/deprecated/vom/vom/qos_map_cmds.hpp
@@ -123,7 +123,7 @@ private:
 }; // namespace VOM
 
 /*
- * fd.io coding-style-patch-verification: ON
+ * fd.io coding-style-patch-verification: OFF
  *
  * Local Variables:
  * eval: (c-set-style "mozilla")
diff --git a/extras/vom/vom/qos_mark.cpp b/extras/deprecated/vom/vom/qos_mark.cpp
index feb889380ff..33ebe40831e 100644
--- a/extras/vom/vom/qos_mark.cpp
+++ b/extras/deprecated/vom/vom/qos_mark.cpp
@@ -179,7 +179,7 @@ mark::event_handler::show(std::ostream& os)
 }; // namespace VOM
 
 /*
- * fd.io coding-style-patch-verification: ON
+ * fd.io coding-style-patch-verification: OFF
  *
  * Local Variables:
  * eval: (c-set-style "mozilla")
diff --git a/extras/vom/vom/qos_mark.hpp b/extras/deprecated/vom/vom/qos_mark.hpp
index 63fec8456fe..2ba5a0d9df6 100644
--- a/extras/vom/vom/qos_mark.hpp
+++ b/extras/deprecated/vom/vom/qos_mark.hpp
@@ -169,7 +169,7 @@ std::ostream& operator<<(std::ostream& os, const QoS::mark::key_t& key);
 }; // namespace VOM
 
 /*
- * fd.io coding-style-patch-verification: ON
+ * fd.io coding-style-patch-verification: OFF
  *
  * Local Variables:
  * eval: (c-set-style "mozilla")
diff --git a/extras/vom/vom/qos_mark_cmds.cpp b/extras/deprecated/vom/vom/qos_mark_cmds.cpp
index 50220b33325..1dd4cc177c5 100644
--- a/extras/vom/vom/qos_mark_cmds.cpp
+++ b/extras/deprecated/vom/vom/qos_mark_cmds.cpp
@@ -135,7 +135,7 @@ dump_cmd::to_string() const
 }; // namespace VOM
 
 /*
- * fd.io coding-style-patch-verification: ON
+ * fd.io coding-style-patch-verification: OFF
  *
  * Local Variables:
  * eval: (c-set-style "mozilla")
diff --git a/extras/vom/vom/qos_mark_cmds.hpp b/extras/deprecated/vom/vom/qos_mark_cmds.hpp
index 976fddc4ea7..8e2882d9ab4 100644
--- a/extras/vom/vom/qos_mark_cmds.hpp
+++ b/extras/deprecated/vom/vom/qos_mark_cmds.hpp
@@ -128,7 +128,7 @@ private:
 }; // namespace VOM
 
 /*
- * fd.io coding-style-patch-verification: ON
+ * fd.io coding-style-patch-verification: OFF
  *
  * Local Variables:
  * eval: (c-set-style "mozilla")
diff --git a/extras/vom/vom/qos_record.cpp b/extras/deprecated/vom/vom/qos_record.cpp
index d56295ca1c4..3c8ea750145 100644
--- a/extras/vom/vom/qos_record.cpp
+++ b/extras/deprecated/vom/vom/qos_record.cpp
@@ -182,7 +182,7 @@ operator<<(std::ostream& os, const QoS::record::key_t& key)
 }; // namespace VOM
 
 /*
- * fd.io coding-style-patch-verification: ON
+ * fd.io coding-style-patch-verification: OFF
  *
  * Local Variables:
  * eval: (c-set-style "mozilla")
diff --git a/extras/vom/vom/qos_record.hpp b/extras/deprecated/vom/vom/qos_record.hpp
index d74413f9293..396b4313643 100644
--- a/extras/vom/vom/qos_record.hpp
+++ b/extras/deprecated/vom/vom/qos_record.hpp
@@ -163,7 +163,7 @@ std::ostream& operator<<(std::ostream& os, const QoS::record::key_t& key);
 }; // namespace VOM
 
 /*
- * fd.io coding-style-patch-verification: ON
+ * fd.io coding-style-patch-verification: OFF
  *
  * Local Variables:
  * eval: (c-set-style "mozilla")
diff --git a/extras/vom/vom/qos_record_cmds.cpp b/extras/deprecated/vom/vom/qos_record_cmds.cpp
index a425187d63c..ec5580ee238 100644
--- a/extras/vom/vom/qos_record_cmds.cpp
+++ b/extras/deprecated/vom/vom/qos_record_cmds.cpp
@@ -131,7 +131,7 @@ dump_cmd::to_string() const
 }; // namespace VOM
 
 /*
- * fd.io coding-style-patch-verification: ON
+ * fd.io coding-style-patch-verification: OFF
  *
  * Local Variables:
  * eval: (c-set-style "mozilla")
diff --git a/extras/vom/vom/qos_record_cmds.hpp b/extras/deprecated/vom/vom/qos_record_cmds.hpp
index bf98e5da824..1cffc11eead 100644
--- a/extras/vom/vom/qos_record_cmds.hpp
+++ b/extras/deprecated/vom/vom/qos_record_cmds.hpp
@@ -126,7 +126,7 @@ private:
 }; // namespace VOM
 
 /*
- * fd.io coding-style-patch-verification: ON
+ * fd.io coding-style-patch-verification: OFF
  *
  * Local Variables:
  * eval: (c-set-style "mozilla")
diff --git a/extras/vom/vom/qos_store.cpp b/extras/deprecated/vom/vom/qos_store.cpp
index 08c2586557d..a55c14b5ecd 100644
--- a/extras/vom/vom/qos_store.cpp
+++ b/extras/deprecated/vom/vom/qos_store.cpp
@@ -178,7 +178,7 @@ store::event_handler::show(std::ostream& os)
 }; // namespace VOM
 
 /*
- * fd.io coding-style-patch-verification: ON
+ * fd.io coding-style-patch-verification: OFF
  *
  * Local Variables:
  * eval: (c-set-style "mozilla")
diff --git a/extras/vom/vom/qos_store.hpp b/extras/deprecated/vom/vom/qos_store.hpp
index b68831497ab..b2f6c67ce1c 100644
--- a/extras/vom/vom/qos_store.hpp
+++ b/extras/deprecated/vom/vom/qos_store.hpp
@@ -168,7 +168,7 @@ std::ostream& operator<<(std::ostream& os, const QoS::store::key_t& key);
 }; // namespace VOM
 
 /*
- * fd.io coding-style-patch-verification: ON
+ * fd.io coding-style-patch-verification: OFF
  *
  * Local Variables:
  * eval: (c-set-style "mozilla")
diff --git a/extras/vom/vom/qos_store_cmds.cpp b/extras/deprecated/vom/vom/qos_store_cmds.cpp
index 2718c7a66e4..1d7d18981f1 100644
--- a/extras/vom/vom/qos_store_cmds.cpp
+++ b/extras/deprecated/vom/vom/qos_store_cmds.cpp
@@ -135,7 +135,7 @@ dump_cmd::to_string() const
 }; // namespace VOM
 
 /*
- * fd.io coding-style-patch-verification: ON
+ * fd.io coding-style-patch-verification: OFF
  *
  * Local Variables:
  * eval: (c-set-style "mozilla")
diff --git a/extras/vom/vom/qos_store_cmds.hpp b/extras/deprecated/vom/vom/qos_store_cmds.hpp
index 35671088a72..29d95de9fb8 100644
--- a/extras/vom/vom/qos_store_cmds.hpp
+++ b/extras/deprecated/vom/vom/qos_store_cmds.hpp
@@ -130,7 +130,7 @@ private:
 }; // namespace VOM
 
 /*
- * fd.io coding-style-patch-verification: ON
+ * fd.io coding-style-patch-verification: OFF
  *
  * Local Variables:
  * eval: (c-set-style "mozilla")
diff --git a/extras/vom/vom/qos_types.cpp b/extras/deprecated/vom/vom/qos_types.cpp
index 7d5d77482b0..6b43c2237e1 100644
--- a/extras/vom/vom/qos_types.cpp
+++ b/extras/deprecated/vom/vom/qos_types.cpp
@@ -31,7 +31,7 @@ source_t::source_t(int v, const std::string& s)
 }; // namespace VOM
 
 /*
- * fd.io coding-style-patch-verification: ON
+ * fd.io coding-style-patch-verification: OFF
  *
  * Local Variables:
  * eval: (c-set-style "mozilla")
diff --git a/extras/vom/vom/qos_types.hpp b/extras/deprecated/vom/vom/qos_types.hpp
index e3c6a169c60..4cdbc416a9f 100644
--- a/extras/vom/vom/qos_types.hpp
+++ b/extras/deprecated/vom/vom/qos_types.hpp
@@ -50,7 +50,7 @@ private:
 }; // namespace VOM
 
 /*
- * fd.io coding-style-patch-verification: ON
+ * fd.io coding-style-patch-verification: OFF
  *
  * Local Variables:
  * eval: (c-set-style "mozilla")
diff --git a/extras/vom/vom/qos_types_api.cpp b/extras/deprecated/vom/vom/qos_types_api.cpp
index 27cbad7b9b0..6c16b4b1997 100644
--- a/extras/vom/vom/qos_types_api.cpp
+++ b/extras/deprecated/vom/vom/qos_types_api.cpp
@@ -48,7 +48,7 @@ to_api(const source_t& s)
 }; // namespace VOM
 
 /*
- * fd.io coding-style-patch-verification: ON
+ * fd.io coding-style-patch-verification: OFF
  *
  * Local Variables:
  * eval: (c-set-style "mozilla")
diff --git a/extras/vom/vom/qos_types_api.hpp b/extras/deprecated/vom/vom/qos_types_api.hpp
index 53cff0d2c69..e8ec9a2bfd3 100644
--- a/extras/vom/vom/qos_types_api.hpp
+++ b/extras/deprecated/vom/vom/qos_types_api.hpp
@@ -27,7 +27,7 @@ vapi_enum_qos_source to_api(const source_t& s);
 }; // namespace VOM
 
 /*
- * fd.io coding-style-patch-verification: ON
+ * fd.io coding-style-patch-verification: OFF
  *
  * Local Variables:
  * eval: (c-set-style "mozilla")
diff --git a/extras/vom/vom/ra_config.cpp b/extras/deprecated/vom/vom/ra_config.cpp
index 67faae699c8..5b11449b192 100644
--- a/extras/vom/vom/ra_config.cpp
+++ b/extras/deprecated/vom/vom/ra_config.cpp
@@ -81,7 +81,7 @@ ra_config::to_string() const
 }
 }
 /*
- * fd.io coding-style-patch-verification: ON
+ * fd.io coding-style-patch-verification: OFF
  *
  * Local Variables:
  * eval: (c-set-style "mozilla")
diff --git a/extras/vom/vom/ra_config.hpp b/extras/deprecated/vom/vom/ra_config.hpp
index 81533162a39..f5b782a72d2 100644
--- a/extras/vom/vom/ra_config.hpp
+++ b/extras/deprecated/vom/vom/ra_config.hpp
@@ -135,7 +135,7 @@ private:
 };
 
 /*
- * fd.io coding-style-patch-verification: ON
+ * fd.io coding-style-patch-verification: OFF
  *
  * Local Variables:
  * eval: (c-set-style "mozilla")
diff --git a/extras/vom/vom/ra_prefix.cpp b/extras/deprecated/vom/vom/ra_prefix.cpp
index fe3ad327f6d..2106879c0ba 100644
--- a/extras/vom/vom/ra_prefix.cpp
+++ b/extras/deprecated/vom/vom/ra_prefix.cpp
@@ -79,7 +79,7 @@ ra_prefix::prefix() const
 }
 
 /*
- * fd.io coding-style-patch-verification: ON
+ * fd.io coding-style-patch-verification: OFF
  *
  * Local Variables:
  * eval: (c-set-style "mozilla")
diff --git a/extras/vom/vom/ra_prefix.hpp b/extras/deprecated/vom/vom/ra_prefix.hpp
index 8e0cf51c055..0be40c403b3 100644
--- a/extras/vom/vom/ra_prefix.hpp
+++ b/extras/deprecated/vom/vom/ra_prefix.hpp
@@ -124,7 +124,7 @@ private:
 };
 
 /*
- * fd.io coding-style-patch-verification: ON
+ * fd.io coding-style-patch-verification: OFF
  *
  * Local Variables:
  * eval: (c-set-style "mozilla")
diff --git a/extras/vom/vom/route.cpp b/extras/deprecated/vom/vom/route.cpp
index b5b93455230..7f4497dfb2c 100644
--- a/extras/vom/vom/route.cpp
+++ b/extras/deprecated/vom/vom/route.cpp
@@ -695,7 +695,7 @@ operator<<(std::ostream& os, const mpath_list_t& key)
 }; // namespace VOM
 
 /*
- * fd.io coding-style-patch-verification: ON
+ * fd.io coding-style-patch-verification: OFF
  *
  * Local Variables:
  * eval: (c-set-style "mozilla")
diff --git a/extras/vom/vom/route.hpp b/extras/deprecated/vom/vom/route.hpp
index 8b68015f7ba..185bd0a04eb 100644
--- a/extras/vom/vom/route.hpp
+++ b/extras/deprecated/vom/vom/route.hpp
@@ -585,7 +585,7 @@ std::ostream& operator<<(std::ostream& os, const ip_mroute::key_t& key);
 }; // namesapce VPP
 
 /*
- * fd.io coding-style-patch-verification: ON
+ * fd.io coding-style-patch-verification: OFF
  *
  * Local Variables:
  * eval: (c-set-style "mozilla")
diff --git a/extras/vom/vom/route_api_types.cpp b/extras/deprecated/vom/vom/route_api_types.cpp
index b6ab6381b12..1c9519c4053 100644
--- a/extras/vom/vom/route_api_types.cpp
+++ b/extras/deprecated/vom/vom/route_api_types.cpp
@@ -182,7 +182,7 @@ from_api(vapi_enum_ip_dscp d)
 }; // namespace VOM
 
 /*
- * fd.io coding-style-patch-verification: ON
+ * fd.io coding-style-patch-verification: OFF
  *
  * Local Variables:
  * eval: (c-set-style "mozilla")
diff --git a/extras/vom/vom/route_api_types.hpp b/extras/deprecated/vom/vom/route_api_types.hpp
index e741a9d5acc..4576488fd43 100644
--- a/extras/vom/vom/route_api_types.hpp
+++ b/extras/deprecated/vom/vom/route_api_types.hpp
@@ -32,7 +32,7 @@ const ip_dscp_t& from_api(vapi_enum_ip_dscp d);
 }; // namespace VOM
 
 /*
- * fd.io coding-style-patch-verification: ON
+ * fd.io coding-style-patch-verification: OFF
  *
  * Local Variables:
  * eval: (c-set-style "mozilla")
diff --git a/extras/vom/vom/route_cmds.cpp b/extras/deprecated/vom/vom/route_cmds.cpp
index 78676c225be..4055b8574df 100644
--- a/extras/vom/vom/route_cmds.cpp
+++ b/extras/deprecated/vom/vom/route_cmds.cpp
@@ -163,7 +163,7 @@ dump_cmd::to_string() const
 } // namespace vom
 
 /*
- * fd.io coding-style-patch-verification: ON
+ * fd.io coding-style-patch-verification: OFF
  *
  * Local Variables:
  * eval: (c-set-style "mozilla")
diff --git a/extras/vom/vom/route_cmds.hpp b/extras/deprecated/vom/vom/route_cmds.hpp
index 3c43208f120..abdba5fa476 100644
--- a/extras/vom/vom/route_cmds.hpp
+++ b/extras/deprecated/vom/vom/route_cmds.hpp
@@ -132,7 +132,7 @@ private:
 }; // namespace VOM
 
 /*
- * fd.io coding-style-patch-verification: ON
+ * fd.io coding-style-patch-verification: OFF
  *
  * Local Variables:
  * eval: (c-set-style "mozilla")
diff --git a/extras/vom/vom/route_domain.cpp b/extras/deprecated/vom/vom/route_domain.cpp
index 16bf5f36c90..5df69f3e62e 100644
--- a/extras/vom/vom/route_domain.cpp
+++ b/extras/deprecated/vom/vom/route_domain.cpp
@@ -220,7 +220,7 @@ route_domain::event_handler::show(std::ostream& os)
 }; // namespace VOPM
 
 /*
- * fd.io coding-style-patch-verification: ON
+ * fd.io coding-style-patch-verification: OFF
  *
  * Local Variables:
  * eval: (c-set-style "mozilla")
diff --git a/extras/vom/vom/route_domain.hpp b/extras/deprecated/vom/vom/route_domain.hpp
index 78db63bbe59..e3e389637d2 100644
--- a/extras/vom/vom/route_domain.hpp
+++ b/extras/deprecated/vom/vom/route_domain.hpp
@@ -190,7 +190,7 @@ private:
 }; // namespace VOM
 
 /*
- * fd.io coding-style-patch-verification: ON
+ * fd.io coding-style-patch-verification: OFF
  *
  * Local Variables:
  * eval: (c-set-style "mozilla")
diff --git a/extras/vom/vom/route_domain_cmds.cpp b/extras/deprecated/vom/vom/route_domain_cmds.cpp
index 8f135e50ef5..217a2ebfbad 100644
--- a/extras/vom/vom/route_domain_cmds.cpp
+++ b/extras/deprecated/vom/vom/route_domain_cmds.cpp
@@ -132,7 +132,7 @@ dump_cmd::to_string() const
 } // namespace route_domain_cmds
 } // namespace VOM
   /*
-   * fd.io coding-style-patch-verification: ON
+   * fd.io coding-style-patch-verification: OFF
    *
    * Local Variables:
    * eval: (c-set-style "mozilla")
diff --git a/extras/vom/vom/route_domain_cmds.hpp b/extras/deprecated/vom/vom/route_domain_cmds.hpp
index 42546da91b4..d500de88063 100644
--- a/extras/vom/vom/route_domain_cmds.hpp
+++ b/extras/deprecated/vom/vom/route_domain_cmds.hpp
@@ -138,7 +138,7 @@ private:
 }; // namespace VOM
 
 /*
- * fd.io coding-style-patch-verification: ON
+ * fd.io coding-style-patch-verification: OFF
  *
  * Local Variables:
  * eval: (c-set-style "mozilla")
diff --git a/extras/vom/vom/rpc_cmd.hpp b/extras/deprecated/vom/vom/rpc_cmd.hpp
index ccb41abbd2d..cba540d9318 100644
--- a/extras/vom/vom/rpc_cmd.hpp
+++ b/extras/deprecated/vom/vom/rpc_cmd.hpp
@@ -141,7 +141,7 @@ protected:
 };
 
 /*
- * fd.io coding-style-patch-verification: ON
+ * fd.io coding-style-patch-verification: OFF
  *
  * Local Variables:
  * eval: (c-set-style "mozilla")
diff --git a/extras/vom/vom/singular_db.hpp b/extras/deprecated/vom/vom/singular_db.hpp
index afca9a3509e..15ec9c5af59 100644
--- a/extras/vom/vom/singular_db.hpp
+++ b/extras/deprecated/vom/vom/singular_db.hpp
@@ -138,7 +138,7 @@ private:
 };
 
 /*
- * fd.io coding-style-patch-verification: ON
+ * fd.io coding-style-patch-verification: OFF
  *
  * Local Variables:
  * eval: (c-set-style "mozilla")
diff --git a/extras/vom/vom/singular_db_funcs.hpp b/extras/deprecated/vom/vom/singular_db_funcs.hpp
index dddc6e4c229..8d32fb58945 100644
--- a/extras/vom/vom/singular_db_funcs.hpp
+++ b/extras/deprecated/vom/vom/singular_db_funcs.hpp
@@ -42,7 +42,7 @@ db_dump(const DB& db, std::ostream& os)
 };
 
 /*
- * fd.io coding-style-patch-verification: ON
+ * fd.io coding-style-patch-verification: OFF
  *
  * Local Variables:
  * eval: (c-set-style "mozilla")
diff --git a/extras/vom/vom/srpc_cmd.hpp b/extras/deprecated/vom/vom/srpc_cmd.hpp
index da6064dafba..258abbf6e15 100644
--- a/extras/vom/vom/srpc_cmd.hpp
+++ b/extras/deprecated/vom/vom/srpc_cmd.hpp
@@ -64,7 +64,7 @@ public:
 };
 
 /*
- * fd.io coding-style-patch-verification: ON
+ * fd.io coding-style-patch-verification: OFF
  *
  * Local Variables:
  * eval: (c-set-style "mozilla")
diff --git a/extras/vom/vom/stat_client.cpp b/extras/deprecated/vom/vom/stat_client.cpp
index 00751dd8d49..ca7bc6e2381 100644
--- a/extras/vom/vom/stat_client.cpp
+++ b/extras/deprecated/vom/vom/stat_client.cpp
@@ -239,7 +239,7 @@ stat_client::index_to_name(uint32_t index)
 } // namespace VOM
 
 /*
- * fd.io coding-style-patch-verification: ON
+ * fd.io coding-style-patch-verification: OFF
  *
  * Local Variables:
  * eval: (c-set-style "mozilla")
diff --git a/extras/vom/vom/stat_client.hpp b/extras/deprecated/vom/vom/stat_client.hpp
index f1745c87b20..355b90caf7b 100644
--- a/extras/vom/vom/stat_client.hpp
+++ b/extras/deprecated/vom/vom/stat_client.hpp
@@ -199,7 +199,7 @@ private:
 }; // namespace VOM
 
 /*
- * fd.io coding-style-patch-verification: ON
+ * fd.io coding-style-patch-verification: OFF
  *
  * Local Variables:
  * eval: (c-set-style "mozilla")
diff --git a/extras/vom/vom/stat_reader.cpp b/extras/deprecated/vom/vom/stat_reader.cpp
index 50a25d2e0ba..34ac6053688 100644
--- a/extras/vom/vom/stat_reader.cpp
+++ b/extras/deprecated/vom/vom/stat_reader.cpp
@@ -131,7 +131,7 @@ stat_reader::read()
 } // namespace VOM
 
 /*
- * fd.io coding-style-patch-verification: ON
+ * fd.io coding-style-patch-verification: OFF
  *
  * Local Variables:
  * eval: (c-set-style "mozilla")
diff --git a/extras/vom/vom/stat_reader.hpp b/extras/deprecated/vom/vom/stat_reader.hpp
index f90b2561602..3deeb439c7b 100644
--- a/extras/vom/vom/stat_reader.hpp
+++ b/extras/deprecated/vom/vom/stat_reader.hpp
@@ -94,7 +94,7 @@ private:
 };
 };
 /*
- * fd.io coding-style-patch-verification: ON
+ * fd.io coding-style-patch-verification: OFF
  *
  * Local Variables:
  * eval: (c-set-style "mozilla")
diff --git a/extras/vom/vom/sub_interface.cpp b/extras/deprecated/vom/vom/sub_interface.cpp
index 42f75791968..3d6912cdcb0 100644
--- a/extras/vom/vom/sub_interface.cpp
+++ b/extras/deprecated/vom/vom/sub_interface.cpp
@@ -106,7 +106,7 @@ sub_interface::find(const key_t& k)
 }; // namespace VOM
 
 /*
- * fd.io coding-style-patch-verification: ON
+ * fd.io coding-style-patch-verification: OFF
  *
  * Local Variables:
  * eval: (c-set-style "mozilla")
diff --git a/extras/vom/vom/sub_interface.hpp b/extras/deprecated/vom/vom/sub_interface.hpp
index 506133c900d..2a24b531ed6 100644
--- a/extras/vom/vom/sub_interface.hpp
+++ b/extras/deprecated/vom/vom/sub_interface.hpp
@@ -100,7 +100,7 @@ private:
 };
 
 /*
- * fd.io coding-style-patch-verification: ON
+ * fd.io coding-style-patch-verification: OFF
  *
  * Local Variables:
  * eval: (c-set-style "mozilla")
diff --git a/extras/vom/vom/sub_interface_cmds.cpp b/extras/deprecated/vom/vom/sub_interface_cmds.cpp
index 853a9b63698..d317303d938 100644
--- a/extras/vom/vom/sub_interface_cmds.cpp
+++ b/extras/deprecated/vom/vom/sub_interface_cmds.cpp
@@ -107,7 +107,7 @@ delete_cmd::to_string() const
 } // namespace sub_interface_cmds
 } // namespace VOM
   /*
-   * fd.io coding-style-patch-verification: ON
+   * fd.io coding-style-patch-verification: OFF
    *
    * Local Variables:
    * eval: (c-set-style "mozilla")
diff --git a/extras/vom/vom/sub_interface_cmds.hpp b/extras/deprecated/vom/vom/sub_interface_cmds.hpp
index a21323200bb..40a2baac879 100644
--- a/extras/vom/vom/sub_interface_cmds.hpp
+++ b/extras/deprecated/vom/vom/sub_interface_cmds.hpp
@@ -98,7 +98,7 @@ public:
 }; // namespace VOM
 
 /*
- * fd.io coding-style-patch-verification: ON
+ * fd.io coding-style-patch-verification: OFF
  *
  * Local Variables:
  * eval: (c-set-style "mozilla")
diff --git a/extras/vom/vom/tap_interface.cpp b/extras/deprecated/vom/vom/tap_interface.cpp
index 6555aeae5ee..a1f3f2bfc16 100644
--- a/extras/vom/vom/tap_interface.cpp
+++ b/extras/deprecated/vom/vom/tap_interface.cpp
@@ -118,7 +118,7 @@ tap_interface::event_handler::show(std::ostream& os)
 }; // namespace VOM
 
 /*
- * fd.io coding-style-patch-verification: ON
+ * fd.io coding-style-patch-verification: OFF
  *
  * Local Variables:
  * eval: (c-set-style "mozilla")
diff --git a/extras/vom/vom/tap_interface.hpp b/extras/deprecated/vom/vom/tap_interface.hpp
index a29ad358b52..b167810bc42 100644
--- a/extras/vom/vom/tap_interface.hpp
+++ b/extras/deprecated/vom/vom/tap_interface.hpp
@@ -108,7 +108,7 @@ private:
 }
 
 /*
- * fd.io coding-style-patch-verification: ON
+ * fd.io coding-style-patch-verification: OFF
  *
  * Local Variables:
  * eval: (c-set-style "mozilla")
diff --git a/extras/vom/vom/tap_interface_cmds.cpp b/extras/deprecated/vom/vom/tap_interface_cmds.cpp
index 16bb065e016..b809c1384f9 100644
--- a/extras/vom/vom/tap_interface_cmds.cpp
+++ b/extras/deprecated/vom/vom/tap_interface_cmds.cpp
@@ -150,7 +150,7 @@ tapv2_dump_cmd::to_string() const
 } // namespace VOM
 
 /*
- * fd.io coding-style-patch-verification: ON
+ * fd.io coding-style-patch-verification: OFF
  *
  * Local Variables:
  * eval: (c-set-style "mozilla")
diff --git a/extras/vom/vom/tap_interface_cmds.hpp b/extras/deprecated/vom/vom/tap_interface_cmds.hpp
index 386dafaa648..386dafaa648 100644
--- a/extras/vom/vom/tap_interface_cmds.hpp
+++ b/extras/deprecated/vom/vom/tap_interface_cmds.hpp
diff --git a/extras/vom/vom/test_stats.cpp b/extras/deprecated/vom/vom/test_stats.cpp
index 6235dd44e3f..6235dd44e3f 100644
--- a/extras/vom/vom/test_stats.cpp
+++ b/extras/deprecated/vom/vom/test_stats.cpp
diff --git a/extras/vom/vom/types.cpp b/extras/deprecated/vom/vom/types.cpp
index 0236df28417..fe86fc6ee2e 100644
--- a/extras/vom/vom/types.cpp
+++ b/extras/deprecated/vom/vom/types.cpp
@@ -334,7 +334,7 @@ operator<<(std::ostream& os, const counter_t& c)
 }; // namespace VOM
 
 /*
- * fd.io coding-style-patch-verification: ON
+ * fd.io coding-style-patch-verification: OFF
  *
  * Local Variables:
  * eval: (c-set-style "mozilla")
diff --git a/extras/vom/vom/types.hpp b/extras/deprecated/vom/vom/types.hpp
index 383735b2756..d04528b0555 100644
--- a/extras/vom/vom/types.hpp
+++ b/extras/deprecated/vom/vom/types.hpp
@@ -416,7 +416,7 @@ std::ostream& operator<<(std::ostream& os, const counter_t& c);
 };
 
 /*
- * fd.io coding-style-patch-verification: ON
+ * fd.io coding-style-patch-verification: OFF
  *
  * Local Variables:
  * eval: (c-set-style "mozilla")
diff --git a/extras/vom/vom/vxlan_gbp_tunnel_cmds.cpp b/extras/deprecated/vom/vom/vxlan_gbp_tunnel_cmds.cpp
index db4e7fc796c..ba9cdb039ac 100644
--- a/extras/vom/vom/vxlan_gbp_tunnel_cmds.cpp
+++ b/extras/deprecated/vom/vom/vxlan_gbp_tunnel_cmds.cpp
@@ -158,7 +158,7 @@ dump_cmd::to_string() const
 } // namespace VOM
 
 /*
- * fd.io coding-style-patch-verification: ON
+ * fd.io coding-style-patch-verification: OFF
  *
  * Local Variables:
  * eval: (c-set-style "mozilla")
diff --git a/extras/vom/vom/vxlan_gbp_tunnel_cmds.hpp b/extras/deprecated/vom/vom/vxlan_gbp_tunnel_cmds.hpp
index 87bca98d302..cac2564b59c 100644
--- a/extras/vom/vom/vxlan_gbp_tunnel_cmds.hpp
+++ b/extras/deprecated/vom/vom/vxlan_gbp_tunnel_cmds.hpp
@@ -128,7 +128,7 @@ public:
 }; // namespace VOM
 
 /*
- * fd.io coding-style-patch-verification: ON
+ * fd.io coding-style-patch-verification: OFF
  *
  * Local Variables:
  * eval: (c-set-style "mozilla")
diff --git a/extras/vom/vom/vxlan_tunnel.cpp b/extras/deprecated/vom/vom/vxlan_tunnel.cpp
index e37d160e92b..5da0c99987f 100644
--- a/extras/vom/vom/vxlan_tunnel.cpp
+++ b/extras/deprecated/vom/vom/vxlan_tunnel.cpp
@@ -351,7 +351,7 @@ vxlan_tunnel::event_handler::show(std::ostream& os)
 }; // namespace VOM
 
 /*
- * fd.io coding-style-patch-verification: ON
+ * fd.io coding-style-patch-verification: OFF
  *
  * Local Variables:
  * eval: (c-set-style "mozilla")
diff --git a/extras/vom/vom/vxlan_tunnel.hpp b/extras/deprecated/vom/vom/vxlan_tunnel.hpp
index 4c46e75a700..aa5d210c13b 100644
--- a/extras/vom/vom/vxlan_tunnel.hpp
+++ b/extras/deprecated/vom/vom/vxlan_tunnel.hpp
@@ -259,7 +259,7 @@ std::ostream& operator<<(std::ostream& os, const vxlan_tunnel::endpoint_t& ep);
 }; // namespace VOM
 
 /*
- * fd.io coding-style-patch-verification: ON
+ * fd.io coding-style-patch-verification: OFF
  *
  * Local Variables:
  * eval: (c-set-style "mozilla")
diff --git a/extras/vom/vom/vxlan_tunnel_cmds.cpp b/extras/deprecated/vom/vom/vxlan_tunnel_cmds.cpp
index da71a99967e..4fd0315f814 100644
--- a/extras/vom/vom/vxlan_tunnel_cmds.cpp
+++ b/extras/deprecated/vom/vom/vxlan_tunnel_cmds.cpp
@@ -154,7 +154,7 @@ dump_cmd::to_string() const
 } // namespace VOM
 
 /*
- * fd.io coding-style-patch-verification: ON
+ * fd.io coding-style-patch-verification: OFF
  *
  * Local Variables:
  * eval: (c-set-style "mozilla")
diff --git a/extras/vom/vom/vxlan_tunnel_cmds.hpp b/extras/deprecated/vom/vom/vxlan_tunnel_cmds.hpp
index 423fcdac950..9c321d101fc 100644
--- a/extras/vom/vom/vxlan_tunnel_cmds.hpp
+++ b/extras/deprecated/vom/vom/vxlan_tunnel_cmds.hpp
@@ -127,7 +127,7 @@ public:
 }; // namespace VOM
 
 /*
- * fd.io coding-style-patch-verification: ON
+ * fd.io coding-style-patch-verification: OFF
  *
  * Local Variables:
  * eval: (c-set-style "mozilla")
diff --git a/extras/rpm/vpp.spec b/extras/rpm/vpp.spec
index 1bb78af8cf7..f04eecc5c24 100644
--- a/extras/rpm/vpp.spec
+++ b/extras/rpm/vpp.spec
@@ -264,7 +264,7 @@ install -m 0644 $MODULES \
 #
 # devel
 #
-for dir in %{_mu_build_dir}/%{_vpp_install_dir}/{vom,vpp}/include/
+for dir in %{_mu_build_dir}/%{_vpp_install_dir}/vpp/include/
 do
 	for subdir in $(cd ${dir} && find . -type d -print)
 	do
diff --git a/test/ext/Makefile b/test/ext/Makefile
index a0dc3e7736c..9c9791b1364 100644
--- a/test/ext/Makefile
+++ b/test/ext/Makefile
@@ -2,7 +2,6 @@ TEST_EXT_DIR=$(TEST_DIR)/ext
 VAPI_BINDIR = $(TEST_BR)/vapi_test
 VAPI_CBIN = $(addprefix $(VAPI_BINDIR), /vapi_c_test)
 VAPI_CPPBIN = $(addprefix $(VAPI_BINDIR), /vapi_cpp_test)
-VOM_BINDIR = $(TEST_BR)/vom_test
 
 VAPI_LIBS = \
   -L$(VPP_INSTALL_PATH)/vpp/lib \
@@ -14,7 +13,7 @@ endif
 
 FLAGS = -g -Wall -lstdc++ -pthread -I$(WS_ROOT)/src -I$(VPP_INSTALL_PATH)/vpp/include -I$(VAPI_BINDIR)
 CFLAGS = -std=gnu99 $(FLAGS)
-CPPFLAGS = -std=c++11 $(FLAGS) -I$(WS_ROOT)/extras/vom
+CPPFLAGS = -std=c++11 $(FLAGS)
 
 $(VAPI_BINDIR):
 	@mkdir -p $(VAPI_BINDIR)
@@ -46,50 +45,16 @@ $(VAPI_CPPBIN).d: $(CPPSRC) $(VAPI_BINDIR)/fake.api.vapi.hpp
 	$(CXX) -o $@ $(CPPFLAGS) -MM -MT '$(VAPI_CPPBIN)' $(CPPSRC) > $@
 endif
 
-ifneq ($(EXTENDED_TESTS),)
-ifeq ($(filter yes y 1,$(EXTENDED_TESTS)),$(EXTENDED_TESTS))
-VOM_BIN = $(addprefix $(VOM_BINDIR), /vom_test)
-VOM_CPPSRC = $(TEST_EXT_DIR)/vom_test.cpp
-
-$(VOM_BINDIR):
-	@mkdir -p $(VOM_BINDIR)
-
-LIB_VOM = -lvom
-VOM_LIBS = \
-	-L$(VPP_INSTALL_PATH)/vom/lib \
-	-lvom						\
-	-lboost_thread					\
-	-lboost_system					\
-	-lboost_filesystem				\
-	-lboost_unit_test_framework			\
-	$(VAPI_LIBS)
-
-VOM_CPPFLAGS = \
-	-I $(WS_ROOT)/src/vpp-api/ \
-	-DBOOST_LOG_DYN_LINK \
-	$(CPPFLAGS)
-
-$(VOM_BIN): $(VOM_CPPSRC) $(VOM_BINDIR)
-	$(CXX) -o $@ $(VOM_CPPFLAGS) -O0 -g $(VOM_CPPSRC) $(VOM_LIBS) -Wl,-rpath,$(VPP_INSTALL_PATH)/vom/lib
-
-$(VOM_BIN).d: $(VOM_CPPSRC) $(VOM_BINDIR)
-	$(CXX) -o $@ $(VOM_CPPFLAGS) -MM -MT '$(VOM_BIN)' $(VOM_CPPSRC) > $@
-endif
-endif
-
 .PHONY: test-apps
-test-apps: $(VAPI_CBIN) $(VAPI_CPPBIN) $(VOM_BIN)
+test-apps: $(VAPI_CBIN) $(VAPI_CPPBIN)
 
 .PHONY: clean
 clean:
-	@rm -rf $(VAPI_BINDIR) $(VOM_BINDIR)
+	@rm -rf $(VAPI_BINDIR)
 
 ifneq ($(MAKECMDGOALS),clean)
 -include $(VAPI_CBIN).d
 ifneq ($(VAPI_CPPBIN),)
 -include $(VAPI_CPPBIN).d
 endif
-ifneq ($(VOM_BIN),)
--include $(VOM_BIN).d
-endif
 endif