Make sure we use the right logic for enabling the media repo.#17424

sandhose merged 2 commits intodevelopelement-hq/synapse:developfrom

quenting/cleanup-enable-media-repoelement-hq/synapse:quenting/cleanup-enable-media-repoCopy head branch name to clipboard