Fix #429 ConfigTool unable to save config changes

Change-Id: Idbae7de253000007337902221ed467df5aa72a61