Add "cancel add gateway" operation, allowing you to abort an add operation that will never succeed 

Fixes #738