Cleanup components after relocating libraries to /usr
Merge pull request #896 from pyhalov/sigcpp

Cleanup components after relocating libraries to /usr