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
Bump src/uaa

Update `cf-registrar` gem in `cf-registrar-bundle-for-identity`

* This makes the version of `cf-registrar` we use be 1.0.1 everywhere, so we
  get consistent support for clustered nats.

* 1.0.1 does failover in clusters correctly; 1.0.0 does not.

Bump cloudfoundry/uaa:
  James Myers:
     Remove `cf-registrar` call from uaa init as it's already in a separate job ( Travis created: https://travis-ci.org/cloudfoundry/uaa/builds/23085165 )

[#69557726]

Signed-off-by: Chris Adams <cadams@pivotallabs.com>
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.
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.