Merge pull request #5451 from jow-/ulogd-conditional-deps