Improve datediff test
Merge branch 'i954' into i945
Javadoc build errors under JDK 8 #945