Merge packaging changes from v1.1

Signed-off-by: Guillermo Ontanon <guillermo@midokura.jp>