Only ignore specific options when specified in media=#1651

nmuggli wants to merge 2 commits into

OpenPrinting:masterOpenPrinting/cups:masterfrom

nmuggli:fix-media-overridenmuggli/cups:fix-media-overrideCopy head branch name to clipboard