refactored the variables used to set the paths to the
/dist-php and /dist folders
Merge upstream master config changes