Merge jdk7u6-b20 into jdk7u6-b21