Fixes #5431: correct port number used on Windows
Fixes #5567: initial promises should not use yum list installed
Merge pull request #510 from ncharles/bug_5567/initial_promises_use_yum

Fixes #5567: initial promises should not use yum list installed
Fixes #5581: activate the modified file repo on Windows
Merge pull request #511 from ncharles/bug_5581/dev/modified_files_windows

Fixes #5581: activate the modified file repo on Windows
Merge pull request #468 from ncharles/bug_5431/dev/port_on_windows

Fixes #5431: correct port number used on Windows
Fixes #5584: Use a variable for modified-files repository (refs #5581)
Merge pull request #513 from ncharles/bug_5584/dev/use_var_for_modified_files

Fixes #5584: Use a variable for modified-files repository
Merge branch 'branches/rudder/2.6' into branches/rudder/2.10
Merge branch 'branches/rudder/2.10' into branches/rudder/2.11