Merge jdk7u12-b07 into jdk7u12-b08