Merge jdk7u40-b37 into jdk7u40-b38