Merge "Use JUnit TemporaryFolder instead of *IoUtils.createTemporaryDirectory()"