Revert "Revert "Revert "Merge pull request #353 from thansmann/cf-jobs-haproxy-fix"""

The default of nil does not match the previous value so existing stubs break.

This reverts commit d1d4cdfe5bdbbf9d76492c3fd8cc484d2314b912.