#471 - Polishing.

Fixed imports and reinstantiated old unit test to make sure we actually test both scenarios.

Original pull request: #497.

src/main/java/org/springframework/hateoas/core/AnnotationMappingDiscoverer.java

@@ -15,7 +15,7 @@
  */
 package org.springframework.hateoas.core;
 
-import static org.springframework.core.annotation.AnnotatedElementUtils.findMergedAnnotation;
+import static org.springframework.core.annotation.AnnotatedElementUtils.*;
 import static org.springframework.core.annotation.AnnotationUtils.*;
 
 import java.lang.annotation.Annotation;