Fix merge error and upgrade buildout version pin
Correct template variables