Fix NPE in Options.retainAll when map option entry omits value#3536

oldergod merged 2 commits intosquare:mastersquare/wire:masterfrom

jhansche:fix-null-option-valuesjhansche/wire:fix-null-option-valuesCopy head branch name to clipboard