Clean up JJB templates

Change-Id: I762dfba3a47748aada6071394ae960cb3c063703
Signed-off-by: Paul Belanger <paul.belanger@polybeacon.com>