Merge "Make sure image exists in test"
Change heat templete

The old template tried to create new user but
the 'identity->username' does not have right to create another users.
The fix changes template so that it creates empty cloud init config
Merge branch 'fix-heat-test-templates' into master-in-use