Fixes to agentctrl tool, more checks and changed delete_site
Merge pull request #1981 from mmeisinger/fix1789_tool_r2

OOIION-1789: Fixes to agentctrl tool, more checks and changed delete_site