Merge jdk7u80-b11 into jdk7u80-b12