Continuation of SecurityGroup work

Change-Id: If9484bcdc50d3b1354d53d9f5d70bfd6f21fe296