Merge pull request #15265 from fbuihuu/mount-fixes

Mount fixes

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

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

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

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

diff --cc src/core/unit.h
Simple merge

diff --cc src/fstab-generator/fstab-generator.c
Simple merge