Merge "Configure civetweb bind socket via puppet-tripleo"