Merge "liblp: Add flock() for accessing partitions" into main