use a single solve for portable lock directories #13645
Description
As discussed in
We should use a single solve when solving portable lock directories.
The performance should be roughly the same and improvements to it can be suggested as further issues after an initial implementation.