Updated template formats to bosh approved template format.

resubmit: now cloned from cloudfoundry develop branch.