Merge jdk7u40-b26 into jdk7u40-b27