6632 - cherry-pick from Helio branch Complete table for Mediaservers to Edge...

6632 - cherry-pick from Helio branch Complete table for Mediaservers to Edge turn on port 3478 - fix de la peinture