Merge "Added option to reset network policies for a given user." into nyc-dev