Brett Meyer, I finally succeeded compiling and tested your fix. It works!
I tested with hibernate-core 4.3.5 and tomcat didn't find the datasource. Then I simply exchanged hibernate-core with the fixed one and tomcat found my datasource.