Updated to bosh approved templates format

3rd try - looks correct now :)
[#75002510]

Signed-off-by: Tony Hansmann <thansmann@pivotallabs.com>
We created a new dev release off of the develop branch (with this pull request merged), uploaded and deployed the release, and saw this error:

```bash
Error 140002: Template `loggregator' (job `loggregator_trafficcontroller_z1') references an unknown release `cf_trafficcontroller'
```

Changing the release name from `cf_trafficcontroller` to `cf` solves the problem.

We found this when deploying cf to a bosh-lite, creating the manifest with
```bash
bosh-lite $ ./scripts/make_manifest_spiff
```

The same applies to line 423.

Cheers,
@krishicks && @drich10
CF Community Pair