Initial work on clientproxy destroy cleanup
Added test for destroy
Merge pull request #2503 from pveentjer/cleanup/3.x/clientproxy-destroy

Cleanup/3.x/clientproxy destroy