HHH-6576 NPE in Ehcache HibernateEhcacheUtils
Conflicts:
	hibernate-ehcache/src/main/java/org/hibernate/cache/ehcache/internal/util/HibernateEhcacheUtils.java