Make the AptGetBuilder changes work with earlier dpkg

Earlier versions of dpkg don't support the variable I was trying to
use, so go with a simpler approach which does work for earlier dpkg.
Merge branch 'master' into generalise-deployment-to-packages