Fixes #3281 - Adds explicit button type to cancel button to allow

form submit on enter.