Add instance-type to label names

So that it's more clear what kind of instance is used for a given
label, add versions of all the labels of the form $image-$type.

Later, we can remove the $image-$ram versions of the labels.

Change-Id: I8fd30274502a9935755306f2ad5c0c16dde14c41
1 file changed