CLOUDSTACK-3927, CLOUDSTACK-3928: Fix NS scripts to add/remove NS device in setupClass/tearDown

Signed-off-by: Prasanna Santhanam <tsp@apache.org>
(cherry picked from commit 1c31ee22d40d77c10593d87b8237cd0489d192cc)