Merge "[SDNC] wrong configuration in mountpoint-registrar.properties"