Merge branch 'master' into SIbranch
Fix distorted "mark-inactive-processes.html" page

Management Cockpit
Merge branch 'SIbranch'