Merge pull request #383 from tribal-tec/master

Make discovery for resources, plugins and server library relocatable
Fix clean build