spigots: General cleanup of messages and VPN settings

Change-Id: I00dd0c512badb249eba3e56a0a86735b1282426b
4 files changed