Update services to use the internal IP and port, now that its available.

Also update services to optionally use named ports.
Needs json/yaml serialization modifiers