Remove InstanceType and ImageId from cinder template

InstanceType and ImageId properties belong to an
AWS::AutoScaling::LaunchConfiguration, for example as used for
NovaCompute0Config in nova-compute-instance.yaml. However this
template doesn't use a LaunchConfig but params instead. AFAICT
we don't need these here (and they cause HEAT template validation
to fail)

Change-Id: If444e4449e3d62cb954de48bc3b55b16dcc8886f
Merge "Remove InstanceType and ImageId from cinder template"