- External Gateway was notgetting removed from nova - fixed it.
- When the External Gateway is presentin the remove command UUID was getting
added 2 time in Delete URL - Fixed it

Change-Id: I0c699434dda0313a7ba72cc05dc9de176104dce2
Partial-Bug: #1400591
Merge "- External Gateway was notgetting removed from nova - fixed it. - When the External Gateway is presentin the remove command UUID was getting added 2 time in Delete URL - Fixed it"