Merge pull request #850 from shenrie/master

Changed AgentConfigurationBuilder to use org_governance_name
Fix instrument agent test