Ensure /etc/machine-id exists.
Merge remote-tracking branch 'upstream/master'