Merge jdk7u6-b01 into jdk7u6-b02