Merge branch 'mule-4.x' into mule-4.x-osgi

Conflicts:
	core/src/main/resources/configuration-builders.properties
	core/src/test/java/org/mule/util/ClassUtilsTestCase.java
	examples/loanbroker-legacy/common/src/main/java/org/mule/example/loanbroker/AbstractLoanBrokerApp.java
	modules/annotations/src/main/java/org/mule/module/annotations/config/processors/DecoratingAnnotatedServiceProcessor.java
	modules/annotations/src/main/resources/META-INF/services/org/mule/config/registry-bootstrap.properties
	modules/client/src/main/java/org/mule/module/client/MuleClient.java
	modules/client/src/main/java/org/mule/module/client/config/ClientNamespaceHandler.java
	modules/client/src/main/java/org/mule/module/client/config/RemoteDispatcherAgentDefinitionParser.java
	modules/jersey/src/main/java/org/mule/module/jersey/config/JerseyNamespaceHandler.java
	modules/scripting/src/main/java/org/mule/module/scripting/builders/ScriptConfigurationBuilder.java
	modules/spring-config/src/main/java/org/mule/module/springconfig/handlers/AbstractMuleNamespaceHandler.java
	modules/spring-config/src/main/java/org/mule/module/springconfig/handlers/MuleNamespaceHandler.java
	modules/spring-config/src/main/java/org/mule/module/springconfig/parsers/specific/ModelDefinitionParser.java
	modules/spring-config/src/main/java/org/mule/module/springconfig/processors/DecoratingFlowAnnotationsBeanProcessor.java
	modules/spring-config/src/main/resources/default-mule-config.xml
	modules/ws/src/main/java/org/mule/module/ws/config/WSNamespaceHandler.java
	modules/ws/src/main/java/org/mule/module/ws/config/spring/factories/WSProxyFactoryBean.java
	modules/ws/src/main/java/org/mule/module/ws/config/spring/parsers/specific/WSProxyDefinitionParser.java
	tests/functional/src/test/java/org/mule/module/springconfig/parsers/specific/ComponentDefinitionParserServiceTestCase.java
	tests/functional/src/test/java/org/mule/test/spring/SpringNamespaceConfigBuilderV2TestCase.java
	tests/functional/src/test/resources/org/mule/module/springconfig/parsers/specific/component-bad-test-service.xml
	tests/functional/src/test/resources/org/mule/module/springconfig/parsers/specific/component-ok-test-service.xml
	tests/integration-axis/src/test/java/org/mule/test/usecases/axis/clientbridge/Client.java
	tools/mule-catalog-archetype/src/main/resources/archetype-resources/src/main/java/config/PatternDefinitionParser.vm
	transports/axis/src/main/java/org/mule/transport/soap/axis/SoapMethod.java
	transports/axis/src/main/java/org/mule/transport/soap/axis/config/AxisNamespaceHandler.java