Adds changes to support moving key files to khaleesi-settings

This change needs to be accepted only after the related
khaleesi-settings change has been merged.

Change-Id: Ibbb501eb7133adb14b9554e8e82a6a0e79cfcfcc