media encryption mandatory

Merged rosset claire requested to merge fix/add_media_encription_mandatory_setting into master Jun 14, 2019