misc updates

These are a few commits from the systemd PR that can be merged independently of that whopper. The baselayout fix is the most important.