Merge metric controller and holder#925

timggggggg merged 16 commits intomasterozontech/file.d:masterfrom

merge-metric-controller-and-holderozontech/file.d:merge-metric-controller-and-holderCopy head branch name to clipboard