Add option to enable/disable parallel make rather than always enable
dist-upgrade was causing failures in generating the new initrd (pre-buildroot build)
Merge branch 'master' of https://github.com/citrix-openstack/qa