Add option to not overwrite value from vanir config

Change-Id: I2b4e4dd20c4991d9540c09ace36175c18cb6bfe4