Fixed the VPC metadata issue.

Changed few more places that reference to instance-data