Trouble-Solver
A person who solves trouble. Solves trouble from troublemakers. a person who is able to come up with variable solution to causes and types of trouble.
Columbo is a Trouble-solver or Mark Sloane is a Trouble-solver e.g someone made a murder causing trouble therefore solved by said names.