Merge pull request #3777 from poettering/id128-rework

uuid/id128 code rework

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

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

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

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