Set instance-id in heat inventory
Fix heat inventory instance-id to use _

Use _ to ensure jinja2 can see the variable