Merge tag 'kivitendo_3.5.4-2' into b-3.5.6.1