Merge pull request #1805 from cloudant/fix-with-haproxy