CAMEL-6951: Improve ServiceHelper utility class.

Conflicts:
	camel-core/src/main/java/org/apache/camel/util/ServiceHelper.java