Cleaned master, bug fix to RemoteBlockInStream.java