NSP matcher not being written to Inventory.CONF

Not sure when this broke, but this used to work, and nothing changed on our end.

I see the Augmentation to match builder being set after I call this method:

http://pastebin.com/1UTr4rxF

The NSI equivalent works fine, but I did note a small change from setNsi() for the NSI case to setValue() for the NSP case, but looking at the methods, they both do the same thing (set the appropriate variable, so its not a type thing).

The NSI method below works fine:
http://pastebin.com/D48ZHfKr

These are in:

package org.opendaylight.groupbasedpolicy.renderer.ofoverlay.flow;

FlowUtils.java