No longer writing control ports to file if updating reversible options fail. Fixes #5605.
DROPGUARDS controller command

Implements ticket 9934; patch from "ra"
Merge remote-tracking branch 'Ryman/bug5605'
Tweak 5605 changes file
Merge remote-tracking branch 'public/bug9934_nm'