Merge branch 'fix-local-grid-ips' into 'develop'

Fix up local dev VM grid IPs to be in line with MR !232

See merge request !240