cli2: fix gateway ip parameter

The gateways seems to have changed their available parameters,
and IP addresses are now accessed via the gateway.ip property.
Merge remote-tracking branch 'remotes/patch/clifix'
Merge branch 'master' into alarm-clock