Bug fix

Change-Id: I464800134bddaccaf47a1123aaab234831ec8e56
Working on images mock

Change-Id: I8d5be56a1a05db3308d6fb6e37390f75506ff0b7
Trying to fix KeyError: 'os_distro'

Change-Id: Idf738faa83d2557abb52dbe1af6cdc05b4164d53