Merge pull request #4250 from pks-t/pks/config-file-iteration Configuration file fixes with includes