Merge "Add tests for java.nio.channels.FileChannel lock methods"