Avoid trailing new lines in variables for templates
Fix s3 settings in tempest.conf in case of HA for nova