Merge jdk7u80-b08 into jdk7u80-b09