Fixes #5224: correct methods to find ncf promises on windows
Fixes #5339: declare the NOVA variable when it is used in metadata.xml
Fixes #5146 - Use 'rudder' as default policy_server to prevent error messages without policy_server.dat file
Merge pull request #442 from nperron/bug_5146/dev/Fix_error_messages_during_start_of_cf_serverd_without_policy_server_dat

Fixes #5146 - Use 'rudder' as default policy_server to prevent error messages without policy_server.dat file
Merge pull request #454 from ncharles/bug_5224/dev/windows_ncf

Fixes #5224: correct methods to find ncf promises on windows
Merge pull request #455 from ncharles/bug_5339/dev/declare_NOVA_when_used

Fixes #5339: declare the NOVA variable when it is used in metadata.xml
Merge branch 'branches/rudder/2.10' into branches/rudder/2.11
Merge branch 'branches/rudder/2.11'