Merge jdk7u66-b15 into jdk7u66-b16