Merge pull request #3642 from chipsalliance/empty_diplomacy

Move clocking/resources out of diplomacy subpackage
8 jobs for dev
in 0 seconds and was queued for 0 seconds
latest Auto DevOps