Merge 676a53aec9e14cd53cfe69be09843b551c8fc6a7 into 3.3

So that the packages look for php.ini in the right place.