Increase DEA next timeout from 25s to 40s.

Also place a higher timeout on the monit stop script. This ensures
a graceful shutdown of DEA next and also ensures that
BOSH health_monitor does not timeout on the stop script.

Change-Id: If2797cb3804d8a299fb42f25cd51f5190db75bc1
Merge "Increase DEA next timeout from 25s to 40s."
Rename nginx process to remove colocation conflicts

Retaining v1/v2 (ng) naming separation so that cc v1 and
cc v2 jobs can be run next to each other if desirable.

Change-Id: I2f4c085d066eee2f31724751025665a2a527b5ee
Merge git://github.com/cloudfoundry/cf-release