Fix new repo (2.7-9 deprecated, add 2.10/2.11
Merge branch 'branches/rudder/2.6' into branches/rudder/2.10
Add 2.11
Merge branch 'branches/rudder/2.10' into branches/rudder/2.11