Merge branch 'master' into SIbranch
Add Workflow Farm Configuration page

Management Cockpit
Merge branch 'SIbranch'