Minor fixes to some configuration files

Change-Id: I59bdd21fbe6166d13e43a7ffdf3ef29638021916
Reviewed-by: Iikka Eklund <iikka.eklund@digia.com>