Ma/org endpoint2

This is in support of the oc_chef_wm ma/org_endpoint2 work.

@opscode/server-team