PHOENIX-908 Remove "Release unknown lockId" warning

Apply remaining portion of patch to avoid the "Release unknown
lockId: 5" warning that is regularly logged.