Merge pull request #2080 from chaloulo/split-mode-host-remove-port-from-journal-filename

journal-remote: split-mode=host, remove port from journal filename

diff --cc src/activate/activate.c
Simple merge

diff --cc src/basic/socket-util.c
Simple merge

diff --cc src/basic/socket-util.h
Simple merge

diff --cc src/core/service.c
Simple merge

diff --cc src/journal-remote/journal-remote.c
Simple merge