UBUNTU: changelog -- explicitly note rebases and clean history

Ensure that all the recent rebases are called out in a consistent manner.
Clean up our history so that joins cleanly with the current live
changelog.

Signed-off-by: Andy Whitcroft <apw@canonical.com>
Signed-off-by: Tim Gardner <tim.gardner@canonical.com>