[Config] additions from ResourceWatcher

This is the reopened (and rebased) version of #4619 which was reverted for 2.1

It is required by #4605