Implementing NamingStrategy for service names.
Merge branch 'master' into enhanced_service_id_generator

Conflicts:
	DependencyInjection/Configuration.php
	DependencyInjection/JMSDiExtraExtension.php
	Metadata/Driver/AnnotationDriver.php
	Resources/config/services.xml