Issue fix for config subsystem

Change-Id: I73d02158accb65c92dabc76eb8b353b052ac2d05
Signed-off-by: Filip Tehlar <ftehlar@cisco.com>
Merge "Issue fix for config subsystem"