Merge "Port further sun.security.* changes"