Fix changelog template
Merge branch 'package/ubuntu' into package/ubuntu-usc