Merge "Add log_format variable for apache openstack sites"