Merge jdk7u4-b13 into jdk7u4-b14