Merge "Establish 7u40 as the current upstream for java{,x}.sql."