Merge jdk7u72-b04 into jdk7u72-b05