Merge "Deprecate FileUtils.closeQuietly"