remove unused lock() method
remove unused getFileBlockLocations(Path p, long start, long len)
Merge pull request #22 from gluster/BZ927290

remove unused getFileBlockLocations(Path p, long start, long len)
Merge pull request #20 from gluster/BZ927284

remove unused lock() method
No changes - just a manual merge (github couldn't auto merge on own).
Merge branch 'master' into BZ927288

Conflicts:
	src/main/java/org/apache/hadoop/fs/glusterfs/GlusterFileSystem.java