Cherry-pick from release-0.4

* made code preparations for build
* Changed config file prefix as for other components

Change-Id: I7169b38c425b411fd3f93fd868c906e6edcd7db4