simplify spiff templates

spiff now supports overriding of primitive values by default
allow specifying of static IPs for runner

this is useful for testing environments, so integration tests can be
pointed statically at the runner VM
Bump src/cloud_controller_ng

Bump cloudfoundry/cloud_controller_ng:
  David Stevenson and Jimmy Da:
     Rescues 404 from service brokers for delete/unbind ( Travis Success: https://travis-ci.org/cloudfoundry/cloud_controller_ng/builds/11489695 )
Remove static_ips line from runner_z1 in job template
Use nil for static_ips for runners, postgres