Buildpack cache now has subdirectories.
switch back to waiting 30 seconds for canary

This is a bit safer than just 5 seconds, as the job could crash soon
after.
restore login client config

Login server config template looks at this to get its secret.
use 'merge' for datadog credentials

Moving them out of properties.template_only.
Merge pull request #158 from rmorgan/master

Buildpack cache now has subdirectories.
Merge git://github.com/cloudfoundry/cf-release