Configuration Drive fixes

* Added Keys model and renaming classes

Change-Id: Id895c8e5bb75a5d765b7701ddd32a81881c2add1
Merge "Configuration Drive fixes"