take over changes from original ubuntu packages and integrate latest changes from 1.6 branch