OOIION-1561: Improvements to data agent control tool
OOIION-1515: Bumped ion-definitions