Add security groups on tenant creation in setup()
Merge branch 'setup-secgroups' into setup-single-network