Merge "CSD: fix test after reverting the force MEL flag." into udc-qpr-dev