update ha_proxy_z1 in cf-job.yml to merge network config

This is needed to support the case where we run haproxy in
an external -> internal network config. It needs two networks
and the previous config hardcodes for a single network.

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

update ha_proxy_z1 in cf-job.yml to merge network config
Revert "Merge pull request #353 from thansmann/cf-jobs-haproxy-fix"

This reverts commit 605c3f35128808e8d9c7c18ef8c827601fbea25f, reversing
changes made to 98356a845c97678a8faeb32c9c46c7127440ba30.
Merge branch 'master' into develop
Revert "Revert "Merge pull request #353 from thansmann/cf-jobs-haproxy-fix""

This reverts commit c8f6723c9474e87ccc59e22d149f3ba58bba348b.