Fix job templates and grain

Change-Id: I50f3cfc78a57d9f7277954247e57c32434a502d1
6 files changed