Merge pull request #3052 from sbueringer/cert-watcher-plus-0.19

Merge pull request #3052 from sbueringer/cert-watcher-plus-0.19 #6