Fixed runtime dependency error on migration tests 6.4.0
Merge remote-tracking branch 'origin/6.4.x' into BS-11736_Monitoring_PM