Merge jdk7u55-b03 into jdk7u55-b04