Use thepeg from cms-externals and update, update herwigpp.

This PR overrides #881.