Merge branch 'generate-vpn-config' into 'develop'

Collect some monitoring host details automatically.

See merge request !234