Fix tenancy and marked for decommission

Fix ec2-instance role after ec2-instance YAML refactoring

• Omit tenancy if unspecified (Will use the AWS VPC default tenancy)
• Fix defaults

@chris.kuperstein @bob.oshel