Merge jdk7u6-b10 into jdk7u6-b11