Vendor drop jdk7u40-b25
Merge branch 'vendordrop'