[PATCH 1/3] more STIG/SSG mapping tweaks