Merge changes Ifc3708c1,If07045c1

* changes:
  Remove uid rules computation in NPMS.
  Include blocked reasons in the netpolicy dump.