Merge branch 'vhost-proxy' into server
port proxy stuff to service nodes
Merge branch 'server' into rabe