Merge pull request #348 from shenrie/master

Refactored governance helper function names
Fixing validation errors with Negotiation objects