[S2FS] Merge Twig into CoreBundle