Merge branch 'master' into rewrites/jpa

diff --cc nbproject/project.properties
index 06346c91b887e1106166467321b560a4206e3f9c,bd9dd2430d42b3c76c1b8b3349874461f704e9bf..6b34e1810c3d76f397946d73b1185b4024d31d15
--- 1/nbproject/project.properties
--- 2/nbproject/project.properties
+++ b/nbproject/project.properties
@@@ -38,10 -38,9 +38,10 @@@ jar.compress=fals
  jar.index=${jnlp.enabled}
  javac.classpath=\
      ${file.reference.log4j-api-2.3.jar}:\
 -    ${file.reference.log4j-core-2.3.jar}
 +    ${file.reference.log4j-core-2.3.jar}:\
 +    ${libs.jpa20-persistence.classpath}
  # Space-separated list of extra javac options
- javac.compilerargs=
+ javac.compilerargs=-Xlint:unchecked -Xlint:deprecation
  javac.deprecation=true
  javac.processorpath=\
      ${javac.classpath}