remove java.nio from TestDataUtilTest
added some comment
solve conflict
Merge branch 'intern' of https://github.com/stratosphere/stratosphere-streaming into intern