Merge "Remove tempest.conf.tpl"