Fine-grained checks on mapper annotations (JAVA-372).
Merge pull request #197 from olim7t/java372

Fine-grained checks on mapper annotations (JAVA-372).
Merge branch '2.1' into 361v2