Merge pull request #4459 from keszybz/commandline-parsing

Commandline parsing simplification and udev fix

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

diff --cc src/journal/journald-server.c
Simple merge