v2-orgs - update v2 api and apipie

v2-orgs - update test
Merge pull request #3504 from thomasmckay/v2-orgs

v2-orgs - update v2 api and apipie