DP-2282 Add commands to agent to modify gateway id
Merge DP-2282 into development stream