Initial draft of VPP changes to cleanup iOAM export.

No match.