Merge jdk7u5-b04 into jdk7u5-b05