Merge pull request #6950 from daverodgman/fix-rsaalt-test-guards