Updated flavor and image parameter names

These match the latest HOT templates (which were updated
to have consistent flavor and image parameter names)

Change-Id: I475a7ae8314b7086e23d5de083d40c177bdaa46e
Merge "Updated flavor and image parameter names"