Merge branch '2.5'

Conflicts:
	src/main/java/com/fasterxml/jackson/databind/deser/BeanDeserializer.java
	src/test/java/com/fasterxml/jackson/databind/deser/TestExceptionHandlingWithJsonCreatorDeserialization.java

Author: cowtowncoder

src/test/java/com/fasterxml/jackson/databind/deser/TestExceptionHandlingWithJsonCreatorDeserialization.java

@@ -8,10 +8,9 @@
 
 import java.io.IOException;
 
-public class TestExceptionHandlingWithJsonCreatorDeserialization extends BaseMapTest {
-
+public class TestExceptionHandlingWithJsonCreatorDeserialization extends BaseMapTest
+{
     static class Foo {
-
         private Bar bar;
 
         @JsonCreator
@@ -25,7 +24,6 @@ public Bar getBar() {
     }
 
     static class Bar {
-
         private Baz baz;
 
         @JsonCreator
@@ -38,9 +36,7 @@ public Baz getBaz() {
         }
     }
 
-
     static class Baz {
-
         private String qux;
 
         @JsonCreator