Javadoc fixes.
Revert to Java 7 for releases (for now).
Javadoc updates.