Merge jdk7u12-b02 into jdk7u12-b03