Merge "Avoid NullPointerException with IoUtils.closeQuietly"