Branch b1_6

Branch b1_6
b=12266
i=green
i=adilger

Concurrent access to the same directory from multiple clients with
intensive file creation/removal can cause a client node to spin in
ll_readdir(). i_version must be increased every time the lock is
cancelled to ensure a revalidate is done.