UNCLASSIFIED - NO CUI

Updates based on SC2S testing and deployment on Konvoy.

John Millerrequested to merge
patch-4 into master

@nicolaschaillan These are changes and updates based on our recent testing on Fences, SC2S.

Merge request reports

UNCLASSIFIED - NO CUI