Merge branch 'master' into SIbranch
configure-edit.html - Add Chosen.js "MultiSelect" option to Scopes list

Management Cockpit
Merge branch 'SIbranch'