Resolve merge conflicts
Bump src/cloud_controller_ng

Bump cloudfoundry/cloud_controller_ng:
  Jeff Schnitzer and Zach Robinson:
     Deactivate plans that are absent from v2 service broker catalogs. ( Travis Success: https://travis-ci.org/cloudfoundry/cloud_controller_ng/builds/12836414 )
Revert "Resolve merge conflicts"

This reverts commit 9e509fe23715c6f1bab28b66d5386c70776a7f0e.