Host own confs & prefs, adapt for Trebuchet

Change-Id: I3875a16a7b5fcf92681aa49a6d8530d35c008fa8