Changes from JWS2 branch merged, mostly javadoc