Fixes cancel on reply form, and also standardizes cancel button markup

Cancel previously caused the form to submit, instead of disappear, sending the user to the topic page itself

Change-Id: I12c5d1eb651254151cf237f633c64fc25f97c589
Merge "Fixes cancel on reply form, and also standardizes cancel button markup"