=rem 3933: Quarantine piercing should not lose quarantine marker
(cherry picked from commit 7c8160b)
Merge pull request #2106 from drewhk/wip-3943-quarantine-preserve-forward-port-drewhk

=rem 3933: Quarantine piercing should not lose quarantine marker (forward port)