Merge pull request #1837 from poettering/grabbag2

variety of fixes

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

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

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

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

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