terraform: fix potential case where cycle is made
Merge remote-tracking branch 'upstream/master' into plugged_security_group