Fixed name_args merging if name_args is nil
Merge branch 'security-groups' of github.com:Technicolor-Portico/ironfan into security-groups
Added retry to Ec2.ensure_tags(tags,ebs_vol), seems to be causing API issues when launched in larger numbers. Fixed infrastructure ensure_security_group_set and bootstrapper.