Merge jdk7u6-b24 into jdk7u8-b03