Correct collector implementation paths
Better labels for Jenkins build steps
Improve error handling of plan config