Merge "Match pdp-d base.conf against image install vars"