Incorporated jdk7u15-b03 changes.