Merge "Add flag to test BpfNetMaps refactoring"