Issue #2600154 by alexpott, Cottser, joelpittet, mfernea, slasher13, vaplas, aleevas, Jo Fitzgerald, skyredwang: Update our Twig code to be ready for Twig 2.x