Revert "Merge branch 'CA-129230' into xs64bit"

This reverts the content of merge 9e28639b:
- fdac607a (CA-129230: [UnitTest] Three..)
- ca832ba7 (CA-129230: Output of SM is ..)

Signed-off-by: Germano Percossi <germano.percossi@citrix.com>