Merge jdk7u40-b29 into jdk7u40-b30