Thanks for this.  Solved my variant of this issue.  I opted for replacing individual service and picked my service. 

option 3. Replace individual service.
picked appropriate file
picked appropriate service (18 - trustmanagement in my case)

Rebooted and all was well.