Merge pull request #2010 from ktf/gh-pages

Fix git-cms-addpkg link. Fix cms-sw/cmssw#2007.
Merge pull request #2306 from ktf/gh-pages

Small example about cherry-picking.
Drop reference to topic collector