Add default variable for ubuntu repos

  * Fix keystorage classes include

Change-Id: I2eb60bc1b828f797c1a118b3ca08e20da7fe66e0
4 files changed