HHH-8738 NPE in HibernateUtil if no default ehcache configuration
Conflicts:
	hibernate-ehcache/src/main/java/org/hibernate/cache/ehcache/internal/util/HibernateEhcacheUtils.java