Fix Cancel button styling

Add borders to the Cancel buttons in the affected html template

Change-Id: I73769a854e8856c8fd759d972bf5adc61fb35666
Partial-Bug: #1364644
Merge "Fix Cancel button styling"