Clean up some verifier messages.

To make things a little more clear.
Also unifies the flavor_id to instance_flavor_id

Change-Id: I43a98965eb6b73f2333fc1f143d8f4f0dac702aa