Merge "[AAF] SSHSM testCA request/values are too low" into frankfurt