Handle existing security group rules

Change-Id: I0aa3bc0c6179f92a12c1e9bbace61597778ffa1f
Merge branch 'fix-extra-opts' into dt-test
Merge branch 'volume-ex-rerun' into dt-test