Vpc security group

This allows to use group and group_id with vpc, it was based on #2366 from @samukasmk but with some fixes that we found on our case.