Fix more DM_DEFAULT_ENCODING
SpotBugs violations
#6098
Merged
DM_DEFAULT_ENCODING
SpotBugs violations
#6098