BS-11822, fix Migration config files problem
Merge remote-tracking branch 'origin/6.4.x' into BS-11736_Monitoring_PM