Some deployment.ini_tmpl changes

These should get into the package, hopefully.