TDQ-9357 msjian: fix a java.io.FileNotFoundException
TDQ-9357 Merge branch 'maintenance/5.6' to master