Fixes #5982: In API/rules include/exclude is ordered for target parameter
Merge pull request #717 from fanf/bug_5982/in_api_rules_include_exclude_is_ordered_for_target_parameter

Fixes #5982: In API/rules include/exclude is ordered for target parameter
Fixes #5988: Error with only "and" target since #5982
Merge pull request #718 from fanf/bug_5988/error_with_only_and_target_since_5982

Fixes #5988: Error with only "and" target since #5982
Merge branch 'branches/rudder/2.10' into branches/rudder/2.11
Merge branch 'branches/rudder/2.11' into branches/rudder/3.0