Merge jdk7u45-b05 into jdk7u45-b06