Merge pull request #1025 from anastasiamac/Bug1320543-debuglog-names-vs-tags

Debug-log accepts names and/or tags for machines/units. Bug 1320543.
Merge pull request #1041 from anastasiamac/debuglog-tags-and-names

Merge pull request #1025 from anastasiamac/Bug1320543-debuglog-names-vs-tags.

Debug-log accepts names and/or tags for machines/units. 

http://pad.lv/1320543

PR 1025 from master.