o.c.alarm.table: view-instance id is now in ViewPart class
Merge remote-tracking branch 'origin/rel15x' into rel15x
Merge remote-tracking branch 'Desy-extern/rel15x' into rel15x