XX-11146: Upgrade Java to 1.7