Merge jdk7u6-b14 into jdk7u6-b15