Merge pull request #3338 from nvollmar/haproxy-http-check
T6246: improve haproxy http check configuration