Merge pull request #1967 from mmeisinger/fix1789_tool_r2

OOIION-1789: Enhances AgentControl script and small preload fixes
Updates ion-functions REL2.0 through pull request 145
Merge pull request #1970 from cwingard/ionfunc-r2

CIDEVMI-1178 Updates ion-functions REL2.0 through pull request 145
Skip tests in cei mode
Added deployment to gitignore
Merge pull request #1973 from jamie-cyber1/skip_tests2

Skip tests in cei mode
Fixed a few rough corners in agentctrl
Merge pull request #1974 from mmeisinger/fix_actrl_r2

Fixed a few rough corners in agentctrl
OOIION-1816: OOI preload for InstrumentAgentInstance fixed
OOI preload for Deployment updates port_assignments on ooiupdate
Merge pull request #1977 from mmeisinger/fix1816_iai_r2

OOIION-1816: OOI preload for InstrumentAgentInstance fixed
Fixes to agentctrl tool, more checks and changed delete_site