Merge "objectcache: deleteObjectsExpiringBefore() signature and code improvements"