Merge jdk7u6-b13 into jdk7u6-b14