sf_cv_constituents clean up
Merge branch 'master' of git@steindawg_greenpeace_git:steindawg/greenpeace.git