Adds changes to support using khaleesi-settings

Removes variables from defaults files and uses
a settings file generated by ksgen to supply
the variable values.

Change-Id: I10db4ca6d30f613f73dc4300df964d96ed9ad8ea