Add remove_gateway_router before delete_router
Add remove_gateway_router before delete_router

To prevent error during cleanup, the router gateway should be cleared
before deleting the router.

Change-Id: I8fe416b7707636c84aa26b6610c13233e2b0ecc6

stackforge/vmtp,stackforge/vmtp,stackforge/vmtp