More fixes for pbuilder job

Change-Id: I5471c696ed0141d55d3d597aab3b169878de0efc
Signed-off-by: Paul Belanger <paul.belanger@polybeacon.com>