Remove variable substituion to %NUM% to correctly invoke local command

Referencing %NUM% must be a mistake, because with it networks are not
deleted properly. See other commands within quantum-adv-test.sh as
an example.

Fixes bug #1164018

Change-Id: Ib222d82a1b8187167606b2543bb74c28b8465b5a
Make sure custom grep options don't get in the way

Change-Id: I3c8fa21793906d80790c31ed02f585eff35a64a5
link /etc/tgt/stack.d to cinder volumes directory

This creates /etc/tgt/stack.d as a symlink to the cinder volumes
directory and includes it in /etc/tgt/targets.conf in a similar way
to /etc/tgt/conf.d

targets.conf only gets appended to when the symlink is created.
Any old /etc/tgt/conf.d/stack.conf is deleted

Change-Id: Ifb6412f6860ceb28b724644fb9b618638f552102
Fixes: bug #1072121
Merge "Remove variable substituion to %NUM% to correctly invoke local command"
Merge "link /etc/tgt/stack.d to cinder volumes directory"
Merge "Make sure custom grep options don't get in the way"
Merge remote-tracking branch 'upstream/master'