Resolved issues with configuration file

Change-Id: I08c8addb8f3c3b40cfdc80f0529e3e6b6eae7fff
Merge "Resolved issues with configuration file" into release-0.1