[KARAF-2642] Merge jdbc feature