Merge "Output reg support for nicira experimenter fields"