[KARAF-2821]transform valid SNAPSHOT version to  org.osgi.framework.Version
(cherry picked from commit d6540b86217386335788ffaf27b7fb8b862b948a)
[KARAF-2820]features-maven-plugin:add-features-to-repo adds wrong transitive feature version
(cherry picked from commit ba11f3b4318407991467192ef73265e43cab5dbf)
[KARAF-2819] Fix password substitution in the MySQL datasource
Merge branch 'karaf-3.0.x' of https://git-wip-us.apache.org/repos/asf/karaf into karaf-3.0.x
[KARAF-2822]org.apache.karaf.jaas.modules.jdbc.JDBCUtils.OSGI contains "bundles:" not "osgi:" as required by the OSGi JNDI spec
(cherry picked from commit 9ba0b65809d1199e232681b27eb44f16b07dac27)
[KARAF-2790] Bundle commands wrongly default to select all bundles
[KARAF-2638] Set specs timeout to 0
[KARAF-2816] Upgrade to Spring 3.2.8.RELEASE_1
[KARAF-2832]Fix exception when using the features-maven-plugin with non osgi compliant features version
(cherry picked from commit e9edfa60e013d7550cd69c5f370fdca99dfb50b2)
[KARAF-2837]The config.properties in karaf-maven-plugin is out-of-data
(cherry picked from commit e8bea631eae3e715c0edb55cef61596ae3fdf102)
[KARAF-2840] Creating child container using admin service should use KARAF_OPTS

Conflicts:
	instance/core/src/main/java/org/apache/karaf/instance/core/internal/InstanceServiceImpl.java
[KARAF-2674] Add spring 4.0.2.RELEASE_1 features
[KARAF-2839] Conditional features are not verified correctly after installing / uninstalling a feature
[KARAF-2674] Remove spring-struts feature for Spring 4.0.x
[KARAF-2849] MBeanServer unregistration is not correctly handled
[KARAF-2850] The karaf-maven-plugin and boot features service should be more resilient with the bootFeatures list.
[KARAF-2851] The FeaturesService can sometime loose the repository list
Fallback to empty string in case KARAF_OPTS is null