Incorporated jdk7u40-b43 changes.