Merge "Cleanup java[x].sql change comments relative to 7u40"