Bug 1035062 - Implement TargetHandlersManager +shepherd

That's not uniform IMHO.