Automatic snapshot from revision 42 (bootstrap)
merge from trunk
* Apply packaging clean-up:
  - Use wrap-and-sort
  - White space cleanup on .bzr-builddeb and debian/copyright
  - Remove un-needed comments from debian/rules
  - Use dh_install --fail-missing
Actually we can bless bootstrap, after we merge this
Rename packages to use generic names, but provide previous package
names as dummy/transitional such that not to break the world.
fix up a couple of remaining references to previous names
* Apply packaging clean-up:
 - Use wrap-and-sort
 - White space cleanup on .bzr-builddeb and debian/copyright
 - Remove un-needed comments from debian/rules
 - Use dh_install --fail-missing
 * Rename packages to use generic names, but provide previous package
  names as dummy/transitional such that not to break the world.

Approved by Didier Roche, Sergio Schvezov, PS Jenkins bot.