Rounded out most of the logic around updating SSL in the STM adapter
Merged conflicts and fixed minor problems in unit tests