OK The cancel button returns!

#5905 

Revert "Removed "cancel" button from node forms and relevant test."

This reverts commit 04eece0f0b12b19e4240c6ab99f6d9f1c11c6270.