shinken: Cleanup to be better compatible with autoload layout

Change-Id: If8d4d1af1f11b8e1cd39c1cee738f709d5bfdae4
Merge "shinken: Cleanup to be better compatible with autoload layout" into production