merge 1.6.0~rc0+dfsg-1exp into ubuntu

Signed-off-by: Serge Hallyn <serge.hallyn@ubuntu.com>
merge changelogs

Signed-off-by: Serge Hallyn <serge.hallyn@ubuntu.com>
update changelog for 1.6.0+dfsg-1 merge

Signed-off-by: Serge Hallyn <serge.hallyn@ubuntu.com>