Improve lock handling.
Merge remote-tracking branch 'origin/master'

Conflicts:
	src/main/java/net/openhft/chronicle/map/VanillaChronicleMap.java
Improve lock handling.