Merge branch 'main' into versions/3.0.0

# Conflicts:
#	package-lock.json
#	test/integration/Identity.test.ts
#	test/integration/RepresentationConverter.test.ts

test/unit/util/locking/RedisResourceLocker.test.ts

@@ -1,5 +1,4 @@
 import { EventEmitter } from 'events';
-// eslint-disable-next-line import/default
 import redis from 'redis';
 import Redlock from 'redlock';
 import type { Lock } from 'redlock';

test/unit/util/locking/SingleThreadedResourceLocker.test.ts

@@ -25,7 +25,6 @@ describe('A SingleThreadedResourceLocker', (): void => {
     await expect(locker.release(identifier)).rejects.toThrow(InternalServerError);
   });
 
-  /* eslint-disable jest/valid-expect-in-promise */
   it('blocks lock acquisition until they are released.', async(): Promise<void> => {
     const results: number[] = [];
     const lock1 = locker.acquire(identifier);