Merge jdk7u40-b23 into jdk7u40-b24