Bug#918386: same as 916875

[David Bremner]

Control: merge 916875 9183386

Looking at /usr/share/emacs/site-lisp/vm/install.log, I see the same
complaint about vm-pcrisis.el and &optional. Merging the two bugs.