Debian fixes

Created by: SunilMohanAdapa

I had to push some changes to master to get things going for Debian package upload. Please review those changes along with these two commits.