Merge jdk7u6-b02 into jdk7u6-b03