CleanupService calls WorkItem#druid instead of #pid
Version bump to 3.22.1
Merge branch 'rel/3.22.1'