Add missing config options, so they are not removed

Change-Id: I80744d10bf85a454028989bee4b2780ae387f212