Removes vim headers 4th round

This is a follow up on:
   Change-Id: Ie8097db6c60481749c88991864187ade64f39ecb

The vim headers in all the files are being removed. We've missed these
files because of delays in the patches.
I hope this is the last one for Tempest.
Closes-Bug: #1229324

Change-Id: If56b28d0efb6364fe2105f7d62d6a2b05b906070
Matches one flavor and one image by default

Changes default in the input-scenario settings to match only
one image and one flavor, to avoid consuming gate time.

Fixes bug 1274628

Change-Id: Ide865012269d3f60250d24443e4f20af263ee021
Merge "Matches one flavor and one image by default"
Merge "Removes vim headers 4th round"