TMDM-7802 Fixed junit test error.
Merge branch 'maintenance/5.6'