Update CfgJinja2Generator.py to more closely match git master code.
The first version matched Bcfg2-1.3.4.
Fix lint warnings.