Merge jdk7u40-b41 jdk