SM-13565 Add Bryan's CA Siteminder edits